Declared here too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
908d45166b
commit
3b90345be1
@ -37,8 +37,8 @@ class wxFrame;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxFrameNameStr;
|
||||
extern const char *wxToolBarNameStr;
|
||||
extern const wxChar *wxFrameNameStr;
|
||||
extern const wxChar *wxToolBarNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxFrame
|
||||
@ -65,7 +65,7 @@ public:
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
|
||||
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
|
||||
const wxString& name = "statusBar");
|
||||
const wxString& name = _T("statusBar"));
|
||||
virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
|
||||
const wxString& name );
|
||||
virtual wxStatusBar *GetStatusBar() const;
|
||||
|
@ -35,8 +35,8 @@ class wxMDIChildFrame;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char* wxFrameNameStr;
|
||||
extern const char* wxStatusLineNameStr;
|
||||
extern const wxChar* wxFrameNameStr;
|
||||
extern const wxChar* wxStatusLineNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMDIParentFrame
|
||||
|
@ -37,7 +37,7 @@ class wxToolBar;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxToolBarNameStr;
|
||||
extern const wxChar *wxToolBarNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxToolBar
|
||||
@ -118,4 +118,3 @@ class wxToolBar: public wxControl
|
||||
|
||||
#endif
|
||||
// __TBARGTKH__
|
||||
|
||||
|
@ -37,8 +37,8 @@ class wxFrame;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxFrameNameStr;
|
||||
extern const char *wxToolBarNameStr;
|
||||
extern const wxChar *wxFrameNameStr;
|
||||
extern const wxChar *wxToolBarNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxFrame
|
||||
@ -65,7 +65,7 @@ public:
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
|
||||
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
|
||||
const wxString& name = "statusBar");
|
||||
const wxString& name = _T("statusBar"));
|
||||
virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
|
||||
const wxString& name );
|
||||
virtual wxStatusBar *GetStatusBar() const;
|
||||
|
@ -35,8 +35,8 @@ class wxMDIChildFrame;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char* wxFrameNameStr;
|
||||
extern const char* wxStatusLineNameStr;
|
||||
extern const wxChar* wxFrameNameStr;
|
||||
extern const wxChar* wxStatusLineNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMDIParentFrame
|
||||
|
@ -37,7 +37,7 @@ class wxToolBar;
|
||||
// global data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxToolBarNameStr;
|
||||
extern const wxChar *wxToolBarNameStr;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxToolBar
|
||||
@ -118,4 +118,3 @@ class wxToolBar: public wxControl
|
||||
|
||||
#endif
|
||||
// __TBARGTKH__
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user