...fixing up a previous Unicode fix.

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index c71be7552c2d9788c05d85ce0f0c02806b0f29b6..48d39d7495fec4abaac98db6b01904a94277195b 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -43,7 +43,7 @@
 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;
 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;

-extern char wxFrameClassName[];
+extern wxChar wxFrameClassName[];

 extern wxMenu *wxCurrentPopupMenu;
 
 #if !USE_SHARED_LIBRARY
 extern wxMenu *wxCurrentPopupMenu;
 
 #if !USE_SHARED_LIBRARY


@@ -384,7 +384,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
 {
   // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
   wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,

-               "recreating status bar in wxFrame" );
+               _T("recreating status bar in wxFrame") );

 
   m_frameStatusBar = OnCreateStatusBar(number, style, id,
     name);
 
   m_frameStatusBar = OnCreateStatusBar(number, style, id,
     name);


@@ -399,14 +399,14 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+  wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );

 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {
 
   m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[])
 {

-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+  wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );

 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();
 
   m_frameStatusBar->SetStatusWidths(n, widths_field);
   PositionStatusBar();


@@ -441,7 +441,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
         return;
     }
 
         return;
     }
 

-    wxCHECK_RET( !menu_bar->GetFrame(), "this menubar is already attached" );
+    wxCHECK_RET( !menu_bar->GetFrame(), _T("this menubar is already attached") );

 
     if (m_frameMenuBar)
         delete m_frameMenuBar;
 
     if (m_frameMenuBar)
         delete m_frameMenuBar;


@@ -487,7 +487,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
  *
  */
 
  *
  */
 

-bool wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *wx_win, const char *title,
+bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,

                    int x, int y, int width, int height, long style)
 
 {
                    int x, int y, int width, int height, long style)
 
 {


@@ -732,7 +732,7 @@ void wxFrame::ClientToScreen(int *x, int *y) const
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     wxCHECK_MSG( m_frameToolBar == NULL, FALSE,

-                 "recreating toolbar in wxFrame" );
+                 _T("recreating toolbar in wxFrame") );

 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)
 
     wxToolBar* toolBar = OnCreateToolBar(style, id, name);
     if (toolBar)