Declared here too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index bfbad63e7a8563f581b1262cb97cf88325350e24..a1745d7f69b95ebbc1f7bbddb55052de6726c679 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -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;

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 5ec157d4ad305fd3be75bbee5ee0e3ba2594191a..2f30d72b4f328aff03baa4e2c52528868ef9fc6c 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -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

diff --git a/include/wx/gtk/tbargtk.h b/include/wx/gtk/tbargtk.h
index a019cefabc2f3858c61f9251f9f8dc86ce44636d..131ce1b7c78430484a8f2306378e5c4a3bcf5f6c 100644 (file)
--- a/include/wx/gtk/tbargtk.h
+++ b/include/wx/gtk/tbargtk.h
@@ -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__
-

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index bfbad63e7a8563f581b1262cb97cf88325350e24..a1745d7f69b95ebbc1f7bbddb55052de6726c679 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -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;

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 5ec157d4ad305fd3be75bbee5ee0e3ba2594191a..2f30d72b4f328aff03baa4e2c52528868ef9fc6c 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -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

diff --git a/include/wx/gtk1/tbargtk.h b/include/wx/gtk1/tbargtk.h
index a019cefabc2f3858c61f9251f9f8dc86ce44636d..131ce1b7c78430484a8f2306378e5c4a3bcf5f6c 100644 (file)
--- a/include/wx/gtk1/tbargtk.h
+++ b/include/wx/gtk1/tbargtk.h
@@ -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__
-