split wxRegion(wxBitmap) ctor into two ctors with clearer semantics

[wxWidgets.git] / include / wx / msw / toplevel.h

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 1fb8f26792d6205b42aee86e72d192263f14d480..86247ab774e3ce59000778e709aaf8677d12f5dc 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxTopLevelWindowMSW : public wxTopLevelWindowBase
 {
 public:
     // constructors and such
-    wxTopLevelWindowMSW();
+    wxTopLevelWindowMSW() { Init(); }
 
     wxTopLevelWindowMSW(wxWindow *parent,
                         wxWindowID id,
@@ -32,7 +32,12 @@ public:
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr);
+                        const wxString& name = wxFrameNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);
+    }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -53,7 +58,9 @@ public:
     virtual void SetIcons(const wxIconBundle& icons );
     virtual void Restore();
 
+#ifndef __WXWINCE__
     virtual bool SetShape(const wxRegion& region);
+#endif // __WXWINCE__
 
     virtual bool Show(bool show = TRUE);
 
@@ -93,7 +100,7 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
-    // translate wxWindows flags to Windows ones
+    // translate wxWidgets flags to Windows ones
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
 
     // choose the right parent to use with CreateWindow()
@@ -120,8 +127,5 @@ protected:
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 };
 
-// list of all frames and modeless dialogs
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
-
 #endif // _WX_MSW_TOPLEVEL_H_