Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Declared here too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-14 11:56:15 +00:00
parent 908d45166b
commit 3b90345be1
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/frame.h
View File

@@ -37,8 +37,8 @@ class wxFrame;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern const char *wxFrameNameStr; extern const wxChar *wxFrameNameStr;
extern const char *wxToolBarNameStr; extern const wxChar *wxToolBarNameStr;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxFrame // wxFrame
@@ -65,7 +65,7 @@ public:
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, 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, virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
const wxString& name ); const wxString& name );
virtual wxStatusBar *GetStatusBar() const; virtual wxStatusBar *GetStatusBar() const;

4
include/wx/gtk/mdi.h
View File

@@ -35,8 +35,8 @@ class wxMDIChildFrame;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern const char* wxFrameNameStr; extern const wxChar* wxFrameNameStr;
extern const char* wxStatusLineNameStr; extern const wxChar* wxStatusLineNameStr;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMDIParentFrame // wxMDIParentFrame

3
include/wx/gtk/tbargtk.h
View File

@@ -37,7 +37,7 @@ class wxToolBar;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern const char *wxToolBarNameStr; extern const wxChar *wxToolBarNameStr;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToolBar // wxToolBar
@@ -118,4 +118,3 @@ class wxToolBar: public wxControl
#endif #endif
// __TBARGTKH__ // __TBARGTKH__

6
include/wx/gtk1/frame.h
View File

@@ -37,8 +37,8 @@ class wxFrame;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern const char *wxFrameNameStr; extern const wxChar *wxFrameNameStr;
extern const char *wxToolBarNameStr; extern const wxChar *wxToolBarNameStr;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxFrame // wxFrame
@@ -65,7 +65,7 @@ public:
virtual void GetClientSize( int *width, int *height ) const; virtual void GetClientSize( int *width, int *height ) const;
virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0, 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, virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
const wxString& name ); const wxString& name );
virtual wxStatusBar *GetStatusBar() const; virtual wxStatusBar *GetStatusBar() const;

4
include/wx/gtk1/mdi.h
View File

@@ -35,8 +35,8 @@ class wxMDIChildFrame;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern const char* wxFrameNameStr; extern const wxChar* wxFrameNameStr;
extern const char* wxStatusLineNameStr; extern const wxChar* wxStatusLineNameStr;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMDIParentFrame // wxMDIParentFrame

3
include/wx/gtk1/tbargtk.h
View File

@@ -37,7 +37,7 @@ class wxToolBar;
// global data // global data
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern const char *wxToolBarNameStr; extern const wxChar *wxToolBarNameStr;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxToolBar // wxToolBar
@@ -118,4 +118,3 @@ class wxToolBar: public wxControl
#endif #endif
// __TBARGTKH__ // __TBARGTKH__