Various changes for Salford C++, and commited fileconf.h/fileconf.cpp changes

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index c46347705cf830a2fa04fac3fa16b4958aecc717..6382aba2f9f23eb59b7f4456e43ef2f8cfded848 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -45,7 +45,7 @@
 #endif
 
 extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
+extern wxList WXDLLEXPORT wxPendingDelete;
 extern char wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 
@@ -331,6 +331,12 @@ bool wxFrame::IsIconized(void) const
   return m_iconized;
 }
 
+// Is it maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    return (::IsZoomed((HWND) GetHWND()) != 0) ;
+}
+
 void wxFrame::SetTitle(const wxString& title)
 {
   SetWindowText((HWND) GetHWND(), (const char *)title);
@@ -606,6 +612,11 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow *
 
   WXDWORD extendedStyle = MakeExtendedStyle(style);
 
+#if !defined(__WIN16__) && !defined(__SC__)
+  if (style & wxFRAME_TOOL_WINDOW)
+    extendedStyle |= WS_EX_TOOLWINDOW;
+#endif
+
   if (style & wxSTAY_ON_TOP)
     extendedStyle |= WS_EX_TOPMOST;