xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 961cd90c52989723b0181b633318bb2344bfb7da..7772899d1bb6e28e4d502d1ca60ff2fd521f11ad 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "toplevel.h"
 #endif
 
     #pragma implementation "toplevel.h"
 #endif
 


@@ -43,10 +43,6 @@
 #include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 
 #include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 

-#ifdef CreateDialog
-#undef CreateDialog
-#endif
-

 #include "wx/display.h"
 
 #ifndef ICON_BIG
 #include "wx/display.h"
 
 #ifndef ICON_BIG


@@ -156,7 +152,12 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags |= WS_POPUP;
     else
     if ( style & wxFRAME_TOOL_WINDOW )
         msflags |= WS_POPUP;
     else

-        msflags |= WS_OVERLAPPED;
+    {
+#ifdef __WXWINCE__
+        if (msflags & WS_BORDER)
+#endif
+            msflags |= WS_OVERLAPPED;
+    }

 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
 
     // border and caption styles
     if ( style & wxRESIZE_BORDER )


@@ -167,13 +168,17 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     }
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
     }
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;

+#ifndef __WXWINCE__

     else
         msflags |= WS_POPUP;
     else
         msflags |= WS_POPUP;

+#endif

 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;
 
     if ( style & wxCAPTION )
         msflags |= WS_CAPTION;

+#ifndef __WXWINCE__

     else
         msflags |= WS_POPUP;
     else
         msflags |= WS_POPUP;

+#endif

 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )
 
     // next translate the individual flags
     if ( style & wxMINIMIZE_BOX )


@@ -336,10 +341,12 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
     if ( exflags )
     {
         ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exflags);
     if ( exflags )
     {
         ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exflags);

-        ::SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
+        ::SetWindowPos(GetHwnd(),
+                       exflags & WS_EX_TOPMOST ? HWND_TOPMOST : 0,
+                       0, 0, 0, 0,

                        SWP_NOSIZE |
                        SWP_NOMOVE |
                        SWP_NOSIZE |
                        SWP_NOMOVE |

-                       SWP_NOZORDER |
+                       (exflags & WS_EX_TOPMOST ? 0 : SWP_NOZORDER) |

                        SWP_NOACTIVATE);
     }
 
                        SWP_NOACTIVATE);
     }
 


@@ -897,7 +904,10 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
 
 // the DialogProc for all wxWindows dialogs
 LONG APIENTRY _EXPORT
 
 // the DialogProc for all wxWindows dialogs
 LONG APIENTRY _EXPORT

-wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+wxDlgProc(HWND WXUNUSED(hDlg),
+          UINT message,
+          WPARAM WXUNUSED(wParam),
+          LPARAM WXUNUSED(lParam))

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