Don't fail to register remaining window classes if

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index b5744e22cee977d7d0f3302ae8d9d97c8daa8042..1d295a13dcb10a951a30447952dd3d1e432420b8 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -206,8 +206,8 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   else
     m_windowId = NewControlId();
 
-  long exflags;
-  long msflags = MSWGetCreateWindowFlags(&exflags);
+  WXDWORD exflags;
+  WXDWORD msflags = MSWGetCreateWindowFlags(&exflags);
 
   if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
                             title,
@@ -245,7 +245,7 @@ wxMDIParentFrame::~wxMDIParentFrame()
     if ( m_hMenu )
     {
         ::DestroyMenu((HMENU)m_hMenu);
-        m_hMenu = NULL;
+        m_hMenu = (WXHMENU)NULL;
     }
 
     if ( m_clientWindow )
@@ -1034,17 +1034,20 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
     // not on the values specified in wxWindow m_max variables
     bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0;
 
+    int minWidth = GetMinWidth(),
+        minHeight = GetMinHeight();
+
     // but allow GetSizeHints() to set the min size
-    if ( m_minWidth != -1 )
+    if ( minWidth != -1 )
     {
-        info->ptMinTrackSize.x = m_minWidth;
+        info->ptMinTrackSize.x = minWidth;
 
         processed = TRUE;
     }
 
-    if ( m_minHeight != -1 )
+    if ( minHeight != -1 )
     {
-        info->ptMinTrackSize.y = m_minHeight;
+        info->ptMinTrackSize.y = minHeight;
 
         processed = TRUE;
     }