From: Ove Kaaven <ovek@arcticnet.no>
Date: Wed, 14 Apr 1999 11:56:15 +0000 (+0000)
Subject: Declared here too
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3b90345be1e457f02b96ff7fde2bfc9b8d100de2?ds=sidebyside

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 bfbad63e7a..a1745d7f69 100644
--- 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 5ec157d4ad..2f30d72b4f 100644
--- 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 a019cefabc..131ce1b7c7 100644
--- 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 bfbad63e7a..a1745d7f69 100644
--- 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 5ec157d4ad..2f30d72b4f 100644
--- 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 a019cefabc..131ce1b7c7 100644
--- 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__
-