do take the toolbar into account for Windows CE, otherwise the menus overlap with...

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 7246affec86b384874db50edad8c57ba91d14a25..e3dccf8050a619f3c2e6b42e8de601dee2530663 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -53,12 +53,6 @@
 #include "wx/msw/missing.h"
 #include "wx/msw/winundef.h"
 
-// This can't be undefed in winundef.h or
-// there are further errors
-#if defined(__WXWINCE__) && defined(CreateDialog)
-#undef CreateDialog
-#endif
-
 #include "wx/display.h"
 
 #ifndef ICON_BIG
@@ -139,9 +133,6 @@ void wxTopLevelWindowMSW::Init()
     m_iconized =
     m_maximizeOnShow = FALSE;
 
-    // unlike (almost?) all other windows, frames are created hidden
-    m_isShown = FALSE;
-
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;
@@ -169,34 +160,24 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         msflags |= WS_POPUP;
     else
     {
-#ifdef __WXWINCE__
         if (msflags & WS_BORDER)
-#endif
             msflags |= WS_OVERLAPPED;
     }
 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
-    {
-#ifndef __WXWINCE__
         msflags |= WS_THICKFRAME;
-#endif
-    }
     else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
         *exflags |= WS_EX_DLGMODALFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
-#ifndef __WXWINCE__
     else
         msflags |= WS_POPUP;
-#endif
 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;
-#ifndef __WXWINCE__
     else
         msflags |= WS_POPUP;
-#endif
 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )
@@ -205,27 +186,23 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         msflags |= WS_MAXIMIZEBOX;
     if ( style & wxSYSTEM_MENU )
         msflags |= WS_SYSMENU;
-#ifndef __WXWINCE__
+
+    // under CE these 2 styles are not defined currently
+#ifdef WS_MINIMIZE
     if ( style & wxMINIMIZE )
         msflags |= WS_MINIMIZE;
+#endif // WS_MINIMIZE
+#ifdef WS_MAXIMIZE
     if ( style & wxMAXIMIZE )
         msflags |= WS_MAXIMIZE;
-#endif
+#endif // WS_MAXIMIZE
 
     // Keep this here because it saves recoding this function in wxTinyFrame
-#if wxUSE_ITSY_BITSY && !defined(__WIN32__)
-    if ( style & wxTINY_CAPTION_VERT )
-        msflags |= IBS_VERTCAPTION;
-    if ( style & wxTINY_CAPTION_HORIZ )
-        msflags |= IBS_HORZCAPTION;
-#else
     if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
         msflags |= WS_CAPTION;
-#endif
 
     if ( exflags )
     {
-#if !defined(__WIN16__)
         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )
@@ -237,6 +214,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
                 style |= wxFRAME_NO_TASKBAR;
             }
 
+            // again, support for this is missing under CE
+#ifdef WS_EX_APPWINDOW
             // We have to solve 2 different problems here:
             //
             // 1. frames with wxFRAME_NO_TASKBAR flag shouldn't appear in the
@@ -249,24 +228,20 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
             // The second one is solved here by using WS_EX_APPWINDOW flag, the
             // first one is dealt with in our MSWGetParent() method
             // implementation
-#ifndef __WXWINCE__
             if ( !(style & wxFRAME_NO_TASKBAR) && GetParent() )
             {
                 // need to force the frame to appear in the taskbar
                 *exflags |= WS_EX_APPWINDOW;
             }
-#endif
             //else: nothing to do [here]
+#endif // WS_EX_APPWINDOW
         }
-#endif // !Win16
 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;
 
-#ifdef __WIN32__
         if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP )
             *exflags |= WS_EX_CONTEXTHELP;
-#endif // __WIN32__
     }
 
     return msflags;
@@ -394,6 +369,15 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
     int x, y, w, h;
     (void)MSWGetCreateWindowCoords(pos, size, x, y, w, h);
 
+    if ( x == (int)CW_USEDEFAULT )
+    {
+        // centre it on the screen - what else can we do?
+        wxSize sizeDpy = wxGetDisplaySize();
+
+        x = (sizeDpy.x - w) / 2;
+        y = (sizeDpy.y - h) / 2;
+    }
+
     if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
     {
         wxLogLastError(wxT("MoveWindow"));
@@ -429,12 +413,15 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
                                  const wxString& name)
 {
     bool ret wxDUMMY_INITIALIZE(false);
-    int w, h;
-    
+
     // init our fields
     Init();
-    w = WidthDefault(size.x);
-    h = HeightDefault(size.y);
+
+    wxSize sizeReal = size;
+    if ( !sizeReal.IsFullySpecified() )
+    {
+        sizeReal.SetDefaults(GetDefaultSize());
+    }
 
     m_windowStyle = style;
 
@@ -477,12 +464,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         if ( style & (wxRESIZE_BORDER | wxCAPTION) )
             dlgTemplate->style |= DS_MODALFRAME;
 
-        ret = CreateDialog(dlgTemplate, title, pos, wxSize(w,h));
+        ret = CreateDialog(dlgTemplate, title, pos, sizeReal);
         free(dlgTemplate);
     }
     else // !dialog
     {
-        ret = CreateFrame(title, pos, wxSize(w,h));
+        ret = CreateFrame(title, pos, sizeReal);
     }
 
     if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) )
@@ -818,11 +805,10 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
     return TRUE;
 }
 
+#ifndef __WXWINCE__
+
 bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
 {
-#ifdef __WXWINCE__
-    return FALSE;
-#else
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
@@ -863,9 +849,10 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
         return FALSE;
     }
     return TRUE;
-#endif
 }
 
+#endif // !__WXWINCE__
+
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------