Oops, I left an extra { in there.

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 76363e5dc777248317811d8d8227c5e0641899d9..41d5a0d46a434211df9ad6ef78cceab198443de1 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -172,6 +172,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         msflags |= WS_THICKFRAME;
 #endif
     }
         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 if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
 #ifndef __WXWINCE__


@@ -213,13 +215,16 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
 
     if ( exflags )
     {
 
     if ( exflags )
     {

-#if !defined(__WIN16__) 
+#if !defined(__WIN16__)

         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )
             {
                 // create the palette-like window
                 *exflags |= WS_EX_TOOLWINDOW;
         if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
         {
             if ( style & wxFRAME_TOOL_WINDOW )
             {
                 // create the palette-like window
                 *exflags |= WS_EX_TOOLWINDOW;

+
+                // tool windows shouldn't appear on the taskbar (as documented)
+                style |= wxFRAME_NO_TASKBAR;

             }
 
             // We have to solve 2 different problems here:
             }
 
             // We have to solve 2 different problems here:


@@ -859,7 +864,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
     if ( event.GetActive() )
     {
         // restore focus to the child which was last focused
     if ( event.GetActive() )
     {
         // restore focus to the child which was last focused

-        wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
+//        wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);

 
         wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
                                             : NULL;
 
         wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
                                             : NULL;