char -> wxChar. (Vadim, you can probably just go ahead messing with

this file now)

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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 2a44e8d3352da9adc811c9e77b5be988ab9b6a73..a2025c9e98debb82388c14db1f2359db9e2bf710 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -29,7 +29,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxFrameNameStr;
+extern const wxChar *wxFrameNameStr;

 extern wxWindowList wxTopLevelWindows;
 
 //-----------------------------------------------------------------------------
 extern wxWindowList wxTopLevelWindows;
 
 //-----------------------------------------------------------------------------


@@ -67,7 +67,7 @@ typedef void (*wxInsertChildFunction)( wxWindow*, wxWindow* );
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxPanelNameStr;
+extern const wxChar *wxPanelNameStr;

 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 
 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 


@@ -434,7 +434,7 @@ public:
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS

-    virtual void ApplyToolTip( GtkTooltips *tips, const char *tip );
+    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );

 #endif // wxUSE_TOOLTIPS
 
     /* private member variables */
 #endif // wxUSE_TOOLTIPS
 
     /* private member variables */

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 2a44e8d3352da9adc811c9e77b5be988ab9b6a73..a2025c9e98debb82388c14db1f2359db9e2bf710 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -29,7 +29,7 @@
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxFrameNameStr;
+extern const wxChar *wxFrameNameStr;

 extern wxWindowList wxTopLevelWindows;
 
 //-----------------------------------------------------------------------------
 extern wxWindowList wxTopLevelWindows;
 
 //-----------------------------------------------------------------------------


@@ -67,7 +67,7 @@ typedef void (*wxInsertChildFunction)( wxWindow*, wxWindow* );
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxPanelNameStr;
+extern const wxChar *wxPanelNameStr;

 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 
 extern const wxSize wxDefaultSize;
 extern const wxPoint wxDefaultPosition;
 


@@ -434,7 +434,7 @@ public:
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS
     virtual void ApplyWidgetStyle();
 
 #if wxUSE_TOOLTIPS

-    virtual void ApplyToolTip( GtkTooltips *tips, const char *tip );
+    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );

 #endif // wxUSE_TOOLTIPS
 
     /* private member variables */
 #endif // wxUSE_TOOLTIPS
 
     /* private member variables */