From a48e51ce114ce424692ee72df853b67da61e7820 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 21 Apr 2004 11:35:04 +0000
Subject: [PATCH] fixed unused variable warning

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/toplevel.cpp | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index e1195914b9..b44e0b8a21 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -414,10 +414,11 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
     WXDWORD exflags;
     WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
 
-	wxSize sz(size);
 #if _WIN32_WCE < 400 || defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
 	// Always expand to fit the screen in PocketPC or SmartPhone
-	sz = wxDefaultSize;
+	wxSize sz(wxDefaultSize);
+#else // other (including normal desktop) Windows
+	wxSize sz(size);
 #endif
 
     return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
@@ -934,29 +935,36 @@ wxDlgProc(HWND hDlg,
           WPARAM WXUNUSED(wParam),
           LPARAM WXUNUSED(lParam))
 {
-    switch ( message )
+    if ( message == WM_INITDIALOG )
     {
-        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
-			// Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
+        // under CE, add a "Ok" button in the dialog title bar and make it full
+        // screen
+        //
+        // VZ: we should probably allow for overriding this, e.g. by including
+        //     MAXIMIZED flag in the dialog style by default and doing this
+        //     only if it is present...
+
+        // Standard SDK doesn't have aygshell.dll: see
+        // include/wx/msw/wince/libraries.h
 #if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK)
-        {
-            SHINITDLGINFO shidi;
-            shidi.dwMask = SHIDIM_FLAGS;
-            shidi.dwFlags = SHIDIF_DONEBUTTON |
-                            SHIDIF_SIZEDLGFULLSCREEN;
-            shidi.hDlg = hDlg;
-            SHInitDialog( &shidi );
-        }
+        SHINITDLGINFO shidi;
+        shidi.dwMask = SHIDIM_FLAGS;
+        shidi.dwFlags = SHIDIF_DONEBUTTON |
+                        SHIDIF_SIZEDLGFULLSCREEN;
+        shidi.hDlg = hDlg;
+        SHInitDialog( &shidi );
+#else // no SHInitDialog()
+        wxUnusedVar(hDlg);
 #endif
-
-        default:
-            // for all the other ones, FALSE means that we didn't process the
-            // message
-            return FALSE;
     }
+
+    // for almost all messages, returning FALSE means that we didn't process
+    // the message
+    //
+    // for WM_INITDIALOG, 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 for it as well
+    return FALSE;
 }
 
 // ============================================================================
-- 
2.45.2