gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index ebbda27e840276d2f0c50abe5e91669591fafb2b..385659df1c46196c195b73ef4c036aad96818d0b 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.h
+// Name:        wx/msw/mdi.h

 // Purpose:     MDI (Multiple Document Interface) classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     MDI (Multiple Document Interface) classes
 // Author:      Julian Smart
 // Modified by:


@@ -120,10 +120,8 @@ private:
 
 class WXDLLEXPORT wxMDIChildFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxMDIChildFrame : public wxFrame
 {

-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-

 public:
 public:

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

     wxMDIChildFrame(wxMDIParentFrame *parent,
                     wxWindowID id,
                     const wxString& title,
     wxMDIChildFrame(wxMDIParentFrame *parent,
                     wxWindowID id,
                     const wxString& title,


@@ -132,6 +130,8 @@ public:
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxFrameNameStr)
     {
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxFrameNameStr)
     {

+        Init();
+

         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 


@@ -146,16 +146,17 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual bool IsTopLevel() const { return FALSE; }
                 const wxString& name = wxFrameNameStr);
 
     virtual bool IsTopLevel() const { return FALSE; }

-    
+

     // MDI operations
     virtual void Maximize(bool maximize = TRUE);
     virtual void Restore();
     virtual void Activate();
 
     // MDI operations
     virtual void Maximize(bool maximize = TRUE);
     virtual void Restore();
     virtual void Activate();
 

-    // Handlers
+    // Implementation only from now on
+    // -------------------------------

 
 

+    // Handlers

     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);

-    bool HandleSize(int x, int y, WXUINT);

     bool HandleWindowPosChanging(void *lpPos);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     bool HandleWindowPosChanging(void *lpPos);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 


@@ -165,13 +166,23 @@ public:
 
     virtual void MSWDestroyWindow();
 
 
     virtual void MSWDestroyWindow();
 

-    // Implementation

     bool ResetWindowStyle(void *vrect);
 
     bool ResetWindowStyle(void *vrect);
 

+    void OnIdle(wxIdleEvent& event);
+

 protected:
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();
 protected:
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();

+
+    // common part of all ctors
+    void Init();
+
+private:
+    bool m_needsResize; // flag which tells us to artificially resize the frame
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -180,8 +191,6 @@ protected:
 
 class WXDLLEXPORT wxMDIClientWindow : public wxWindow
 {
 
 class WXDLLEXPORT wxMDIClientWindow : public wxWindow
 {

-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-

 public:
     wxMDIClientWindow() { Init(); }
     wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
 public:
     wxMDIClientWindow() { Init(); }
     wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)


@@ -198,6 +207,9 @@ public:
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 

+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 protected:
     void Init() { m_scrollX = m_scrollY = 0; }
 
 protected:
     void Init() { m_scrollX = m_scrollY = 0; }
 


@@ -205,6 +217,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

 };
 
 #endif
 };
 
 #endif