Calss interface updates (wxMotif-only).

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 3a25093115d0036f6149120023f8aa03ebab7cd4..9ce65687c60bacaa7596f83965b0c199a7e4c5ea 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -35,6 +35,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
+    #include "wx/containr.h"        // wxSetFocusToChild()
 #endif //WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -60,6 +61,11 @@ static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return FALSE; }
 
 #endif // __WXMICROWIN__
 
+// NB: wxDlgProc must be defined here and not in dialog.cpp because the latter
+//     is not included by wxUniv build which does need wxDlgProc
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -81,28 +87,6 @@ BEGIN_EVENT_TABLE(wxTopLevelWindowMSW, wxTopLevelWindowBase)
     EVT_ACTIVATE(wxTopLevelWindowMSW::OnActivate)
 END_EVENT_TABLE()
 
-// ----------------------------------------------------------------------------
-// wxDialog helpers
-// ----------------------------------------------------------------------------
-
-// Dialog window proc
-LONG APIENTRY _EXPORT
-wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    switch ( message )
-    {
-        case WM_INITDIALOG:
-            // for this message, returning TRUE tells system to set focus to
-            // the first control in the dialog box, but as we set the focus
-            // ourselves, we return FALSE from here as well, so fall through
-
-        default:
-            // for all the other ones, FALSE means that we didn't process the
-            // message
-            return FALSE;
-    }
-}
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW creation
 // ----------------------------------------------------------------------------
@@ -260,7 +244,7 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
         parent = ms_hiddenParent;
     }
 
-    return parent ? parent->GetHWND() : NULL;
+    return parent ? parent->GetHWND() : WXHWND(NULL);
 }
 
 bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
@@ -800,3 +784,21 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
     }
 }
 
+// the DialogProc for all wxWindows dialogs
+LONG APIENTRY _EXPORT
+wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+    switch ( message )
+    {
+        case WM_INITDIALOG:
+            // for this message, returning TRUE tells system to set focus to
+            // the first control in the dialog box, but as we set the focus
+            // ourselves, we return FALSE from here as well, so fall through
+
+        default:
+            // for all the other ones, FALSE means that we didn't process the
+            // message
+            return FALSE;
+    }
+}
+