Unicode fixes. Appears that this may be the last before wxMSW will link

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 86667218174574f55614b12e17ceeb950dede7b8..d305041600da1b2372151f3bbd9269103e68c9a3 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -57,8 +57,8 @@
 extern wxWindowList wxModelessWindows;      // from dialog.cpp
 extern wxMenu *wxCurrentPopupMenu;
 
 extern wxWindowList wxModelessWindows;      // from dialog.cpp
 extern wxMenu *wxCurrentPopupMenu;
 

-extern char wxMDIFrameClassName[];
-extern char wxMDIChildFrameClassName[];
+extern wxChar wxMDIFrameClassName[];
+extern wxChar wxMDIChildFrameClassName[];

 extern wxWindow *wxWndHook;                 // from window.cpp
 
 extern wxList *wxWinHandleList;
 extern wxWindow *wxWndHook;                 // from window.cpp
 
 extern wxList *wxWinHandleList;


@@ -174,7 +174,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   int width = size.x;
   int height = size.y;
 
   int width = size.x;
   int height = size.y;
 

-  m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu");
+  m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), _T("wxWindowMenu"));

 
   DWORD msflags = WS_OVERLAPPED;
   if (style & wxMINIMIZE_BOX)
 
   DWORD msflags = WS_OVERLAPPED;
   if (style & wxMINIMIZE_BOX)


@@ -1002,7 +1002,7 @@ void wxMDIChildFrame::MSWDestroyWindow()
 #ifdef __WIN32__
     SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, (LPARAM)0);
 #else
 #ifdef __WIN32__
     SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, (LPARAM)0);
 #else

-    SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0);
+    SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, 0);

 #endif
     invalidHandle = 0;
 
 #endif
     invalidHandle = 0;
 


@@ -1084,7 +1084,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,

-                        "MDICLIENT",
+                        _T("MDICLIENT"),

                         NULL,
                         msStyle,
                         0, 0, 0, 0,
                         NULL,
                         msStyle,
                         0, 0, 0, 0,


@@ -1137,7 +1137,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();
 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();

-    wxCHECK_RET( parent, "MDI client without parent frame? weird..." );
+    wxCHECK_RET( parent, _T("MDI client without parent frame? weird...") );

 
     ::DrawMenuBar(GetWinHwnd(parent));
 }
 
     ::DrawMenuBar(GetWinHwnd(parent));
 }


@@ -1150,11 +1150,11 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
     bool success = FALSE;
     for ( int i = 0; i < N; i++ )
     {
     bool success = FALSE;
     for ( int i = 0; i < N; i++ )
     {

-        char buf[256];
+        wxChar buf[256];

         int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
         if ( chars == 0 )
         {
         int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
         if ( chars == 0 )
         {

-            wxLogLastError("GetMenuString");
+            wxLogLastError(_T("GetMenuString"));

 
             continue;
         }
 
             continue;
         }


@@ -1163,7 +1163,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
         {
             success = TRUE;
             ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
         {
             success = TRUE;
             ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,

-                         (UINT)subMenu, "&Window");
+                         (UINT)subMenu, _T("&Window"));

             break;
         }
     }
             break;
         }
     }