X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d4875664f6242d1580db047173d3075b047435e..85f138db83939ce7c59a942aaecca7fa98168db3:/src/msw/toplevel.cpp?ds=sidebyside

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 2f50475dcd..3cf38606e3 100644
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -143,6 +143,10 @@ void wxTopLevelWindowMSW::Init()
     m_fsIsShowing = FALSE;
 
     m_winLastFocused = (wxWindow *)NULL;
+
+#ifdef __SMARTPHONE__
+    m_MenuBarHWND = 0;
+#endif
 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
@@ -416,10 +420,11 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
 #if !defined(__HANDHELDPC__) && ((defined(_WIN32_WCE) && _WIN32_WCE < 400) || \
     defined(__POCKETPC__) || \
     defined(__SMARTPHONE__))
-	// Always expand to fit the screen in PocketPC or SmartPhone
-	wxSize sz(wxDefaultSize);
+    // Always expand to fit the screen in PocketPC or SmartPhone
+    wxSize sz(wxDefaultSize);
+    wxUnusedVar(size);
 #else // other (including normal desktop) Windows
-	wxSize sz(size);
+    wxSize sz(size);
 #endif
 
     return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
@@ -515,12 +520,16 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         );
     }
 
-	// Native look is full screen window on Smartphones and Standard SDK
+    // Native look is full screen window on Smartphones and Standard SDK
 #if defined(__WXWINCE__)
     if ( style & wxMAXIMIZE )
-	{
-	    this->Maximize();
-	}
+    {
+        this->Maximize();
+    }
+#endif
+
+#ifdef __SMARTPHONE__
+    SetRightMenu(); // to nothing for initialization
 #endif
 
     return ret;
@@ -567,9 +576,9 @@ bool wxTopLevelWindowMSW::Show(bool show)
             // show and maximize
             nShowCmd = SW_MAXIMIZE;
 
-			// This is necessary, or no window appears
+            // This is necessary, or no window appears
 #ifdef __WINCE_STANDARDSDK__
-			DoShowWindow(SW_SHOW);
+            DoShowWindow(SW_SHOW);
 #endif
 
             m_maximizeOnShow = FALSE;
@@ -967,8 +976,11 @@ wxDlgProc(HWND hDlg,
 #if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)
         SHINITDLGINFO shidi;
         shidi.dwMask = SHIDIM_FLAGS;
-        shidi.dwFlags = SHIDIF_DONEBUTTON |
-                        SHIDIF_SIZEDLGFULLSCREEN;
+        shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN
+#ifndef __SMARTPHONE__
+                        | SHIDIF_DONEBUTTON
+#endif
+                        ;
         shidi.hDlg = hDlg;
         SHInitDialog( &shidi );
 #else // no SHInitDialog()