another GetInt/GetId bug fix

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index be0e9d10e2bfa57ffc92078a620e5a804788d04b..501b0fe8b698bdc775a0201b0b4b253c63dd7550 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -666,12 +666,12 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
   // make all frames appear in the win9x shell taskbar unless
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
   // make all frames appear in the win9x shell taskbar unless

-  // wxFRAME_TOOL_WINDOW is explicitly given - without giving them
+  // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without giving them

   // WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't appear in it
 #if !defined(__WIN16__) && !defined(__SC__)
   // WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't appear in it
 #if !defined(__WIN16__) && !defined(__SC__)

-  if (style & wxFRAME_TOOL_WINDOW)
+  if ( style & wxFRAME_TOOL_WINDOW )

       extendedStyle |= WS_EX_TOOLWINDOW;
       extendedStyle |= WS_EX_TOOLWINDOW;

-  else
+  else if ( !(style & wxFRAME_NO_TASKBAR) )

       extendedStyle |= WS_EX_APPWINDOW;
 #endif
 
       extendedStyle |= WS_EX_APPWINDOW;
 #endif