docopydocs is not needed for this script.

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index e1ac910f09fb487ae93a8169f9f755daaf14987d..40a506ca96e9201856471a162c542460fdb8d8fc 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -177,9 +177,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     // WS_POPUP in a few cases just to avoid having caption/border which we
     // don't want
 
     // WS_POPUP in a few cases just to avoid having caption/border which we
     // don't want
 

-#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))

     // border and caption styles
     // border and caption styles

-    if ( style & wxRESIZE_BORDER )
+    if ( ( style & wxRESIZE_BORDER ) && !IsAlwaysMaximized())

         msflags |= WS_THICKFRAME;
     else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
         *exflags |= WS_EX_DLGMODALFRAME;
         msflags |= WS_THICKFRAME;
     else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
         *exflags |= WS_EX_DLGMODALFRAME;


@@ -188,7 +187,6 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
 #ifndef __POCKETPC__
     else
         msflags |= WS_POPUP;
 #ifndef __POCKETPC__
     else
         msflags |= WS_POPUP;

-#endif

 #endif
 
     // normally we consider that all windows without a caption must be popups,
 #endif
 
     // normally we consider that all windows without a caption must be popups,


@@ -223,10 +221,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     if ( style & wxMINIMIZE )
         msflags |= WS_MINIMIZE;
 
     if ( style & wxMINIMIZE )
         msflags |= WS_MINIMIZE;
 

-#if !defined(__POCKETPC__)

     if ( style & wxMAXIMIZE )
         msflags |= WS_MAXIMIZE;
     if ( style & wxMAXIMIZE )
         msflags |= WS_MAXIMIZE;

-#endif

 
     // Keep this here because it saves recoding this function in wxTinyFrame
     if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
 
     // Keep this here because it saves recoding this function in wxTinyFrame
     if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )


@@ -315,9 +311,13 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
 bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
 {
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
 bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
 {

-    SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
-    if (!info) return false;
-    return SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info) == TRUE;
+    SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo;
+    if ( info )
+    {
+        SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info);
+    }
+
+    return wxWindowMSW::HandleSettingChange(wParam, lParam);

 }
 #endif
 
 }
 #endif
 


@@ -345,11 +345,6 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
 
             break;
         }
 
             break;
         }

-        case WM_SETTINGCHANGE:
-        {
-            processed = HandleSettingChange(wParam,lParam);
-            break;
-        }

         case WM_HIBERNATE:
         {
             if (wxTheApp)
         case WM_HIBERNATE:
         {
             if (wxTheApp)


@@ -496,15 +491,16 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
     WXDWORD exflags;
     WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
 
     WXDWORD exflags;
     WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
 

-#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);
-    wxUnusedVar(size);
-#else // other (including normal desktop) Windows
-    wxSize sz(size);
-#endif
+    wxSize sz;
+
+    if (IsAlwaysMaximized())
+    {
+        sz = wxDefaultSize;
+    }
+    else
+    {
+        sz = size;
+    }

 
     bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
 
 
     bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
 


@@ -600,7 +596,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     // Note: if we include PocketPC in this test, dialogs can fail to show up,
     // for example the text entry dialog in the dialogs sample. Problem with Maximise()?
 #if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__WINCE_STANDARDSDK__))
     // Note: if we include PocketPC in this test, dialogs can fail to show up,
     // for example the text entry dialog in the dialogs sample. Problem with Maximise()?
 #if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__WINCE_STANDARDSDK__))

-    if ( style & wxMAXIMIZE )
+    if ( ( style & wxMAXIMIZE ) || IsAlwaysMaximized() )

     {
         this->Maximize();
     }
     {
         this->Maximize();
     }


@@ -725,11 +721,11 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
 
 bool wxTopLevelWindowMSW::IsMaximized() const
 {

-#ifdef __WXWINCE__
-    return false;
-#else
-    return m_maximizeOnShow || ::IsZoomed(GetHwnd()) != 0;
+    return IsAlwaysMaximized() ||
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+           (::IsZoomed(GetHwnd()) != 0) ||

 #endif
 #endif

+           m_maximizeOnShow;

 }
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)
 }
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)


@@ -742,10 +738,11 @@ bool wxTopLevelWindowMSW::IsIconized() const
 #ifdef __WXWINCE__
     return false;
 #else
 #ifdef __WXWINCE__
     return false;
 #else

-    // also update the current state
-    ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;
-
-    return m_iconized;
+    // don't use m_iconized, it may be briefly out of sync with the real state
+    // as it's only modified when we receive a WM_SIZE and we could be called
+    // from an event handler from one of the messages we receive before it,
+    // such as WM_MOVE
+    return ::IsIconic(GetHwnd()) != 0;

 #endif
 }
 
 #endif
 }
 


@@ -1094,8 +1091,8 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
 LONG APIENTRY _EXPORT
 wxDlgProc(HWND hDlg,
           UINT message,
 LONG APIENTRY _EXPORT
 wxDlgProc(HWND hDlg,
           UINT message,

-          WPARAM wParam,
-          LPARAM lParam)
+          WPARAM WXUNUSED(wParam),
+          LPARAM WXUNUSED(lParam))

 {
     switch ( message )
     {
 {
     switch ( message )
     {


@@ -1127,18 +1124,6 @@ wxDlgProc(HWND hDlg,
             // ourselves, we return FALSE for it as well
             return FALSE;
         }
             // ourselves, we return FALSE for it as well
             return FALSE;
         }

-
-        case WM_SETTINGCHANGE:
-        {
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
-            wxTopLevelWindow *tlw = wxDynamicCast(wxGetWindowFromHWND(hDlg), wxTopLevelWindow);
-            if(tlw) return tlw->HandleSettingChange(wParam,lParam) ? TRUE : FALSE;
-#else
-            wxUnusedVar(wParam);
-            wxUnusedVar(lParam);
-#endif
-            break;
-        }

     }
 
     // for almost all messages, returning FALSE means that we didn't process
     }
 
     // for almost all messages, returning FALSE means that we didn't process