region from polygon added

[wxWidgets.git] / include / wx / generic / mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index c56f571f4ba5852a86ea97eaedcb0c84a097ae99..b686a423822a50e0327d65aa161cb6fbbc6bb1c7 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -160,10 +160,10 @@ public:
     // no size hints
     virtual void SetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),
     // no size hints
     virtual void SetSizeHints( int WXUNUSED(minW),
                                int WXUNUSED(minH),

-                               int WXUNUSED(maxW) = -1,
-                               int WXUNUSED(maxH) = -1,
-                               int WXUNUSED(incW) = -1,
-                               int WXUNUSED(incH) = -1) {}
+                               int WXUNUSED(maxW) = wxDefaultCoord,
+                               int WXUNUSED(maxH) = wxDefaultCoord,
+                               int WXUNUSED(incW) = wxDefaultCoord,
+                               int WXUNUSED(incH) = wxDefaultCoord) {}

 
 #if wxUSE_TOOLBAR
     // no toolbar bars
 
 #if wxUSE_TOOLBAR
     // no toolbar bars


@@ -179,15 +179,15 @@ public:
     void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
 
     // no maximize etc
     void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
 
     // no maximize etc

-    virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ }
+    virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }

     virtual void Restore() { /* Has no effect */ }
     virtual void Restore() { /* Has no effect */ }

-    virtual void Iconize(bool WXUNUSED(iconize)  = TRUE) { /* Has no effect */ }
-    virtual bool IsMaximized() const { return TRUE; }
-    virtual bool IsIconized() const { return FALSE; }
-    virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; }
-    virtual bool IsFullScreen() const { return FALSE; }
+    virtual void Iconize(bool WXUNUSED(iconize)  = true) { /* Has no effect */ }
+    virtual bool IsMaximized() const { return true; }
+    virtual bool IsIconized() const { return false; }
+    virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; }
+    virtual bool IsFullScreen() const { return false; }

 
 

-    virtual bool IsTopLevel() const { return FALSE; }
+    virtual bool IsTopLevel() const { return false; }

 
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);
 
     void OnMenuHighlight(wxMenuEvent& event);
     void OnActivate(wxActivateEvent& event);


@@ -274,18 +274,21 @@ class wxMDIChildFrame ;
 class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
 {
 public:
 class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
 {
 public:

-    wxMDIParentFrame();
+    wxMDIParentFrame() {}

     wxMDIParentFrame(wxWindow *parent,
                      wxWindowID winid,
                      const wxString& title,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
     wxMDIParentFrame(wxWindow *parent,
                      wxWindowID winid,
                      const wxString& title,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,

-                     const wxString& name = wxFrameNameStr) ;
+                     const wxString& name = wxFrameNameStr)
+         :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name)
+     {
+     }

 
     wxMDIChildFrame * GetActiveChild() const ;
 
     wxMDIChildFrame * GetActiveChild() const ;

-    
-    
+
+

 private:
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 };


@@ -297,14 +300,18 @@ private:
 class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
 {
 public:
 class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
 {
 public:

-    wxMDIChildFrame();
+    wxMDIChildFrame() {}
+

     wxMDIChildFrame( wxGenericMDIParentFrame *parent,
                      wxWindowID winid,
                      const wxString& title,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE,
     wxMDIChildFrame( wxGenericMDIParentFrame *parent,
                      wxWindowID winid,
                      const wxString& title,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxDEFAULT_FRAME_STYLE,

-                     const wxString& name = wxFrameNameStr ) ;
+                     const wxString& name = wxFrameNameStr )
+         :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name)
+     {
+     }

 private:
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };


@@ -316,8 +323,12 @@ private:
 class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
 {
 public:
 class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
 {
 public:

-    wxMDIClientWindow();
-    wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
+    wxMDIClientWindow() {}
+
+    wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 )
+        :wxGenericMDIClientWindow(parent, style)
+    {
+    }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)