Make PaintBackground virtual, too. Now that we have

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index d70470724b367696983e4f5415fb12124f2ca789..a5bdff00cbe949402aa757a652f8ea208b40f4d4 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -12,14 +12,14 @@
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "mdi.h"
 #endif
 
 #include "wx/frame.h"
 
     #pragma interface "mdi.h"
 #endif
 
 #include "wx/frame.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;

 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;


@@ -69,11 +69,12 @@ public:
     // MDI windows menu
     wxMenu* GetWindowMenu() const { return m_windowMenu; };
     void SetWindowMenu(wxMenu* menu) ;
     // MDI windows menu
     wxMenu* GetWindowMenu() const { return m_windowMenu; };
     void SetWindowMenu(wxMenu* menu) ;

+    virtual void DoMenuUpdates(wxMenu* menu = NULL);

 
     // MDI operations
     // --------------
     virtual void Cascade();
 
     // MDI operations
     // --------------
     virtual void Cascade();

-    virtual void Tile();
+    virtual void Tile(wxOrientation orient = wxHORIZONTAL);

     virtual void ArrangeIcons();
     virtual void ActivateNext();
     virtual void ActivatePrevious();
     virtual void ArrangeIcons();
     virtual void ActivateNext();
     virtual void ActivatePrevious();


@@ -90,9 +91,9 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 

-    virtual long MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
+    virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);

     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:


@@ -106,7 +107,7 @@ protected:
     wxMDIChildFrame *               m_currentChild;
     wxMenu*                         m_windowMenu;
 
     wxMDIChildFrame *               m_currentChild;
     wxMenu*                         m_windowMenu;
 

-    // TRUE if MDI Frame is intercepting commands, not child
+    // true if MDI Frame is intercepting commands, not child

     bool m_parentFrameActive;
 
 private:
     bool m_parentFrameActive;
 
 private:


@@ -114,6 +115,7 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)

+    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)

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


@@ -147,10 +149,10 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

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

 
     // MDI operations
 
     // MDI operations

-    virtual void Maximize(bool maximize = TRUE);
+    virtual void Maximize(bool maximize = true);

     virtual void Restore();
     virtual void Activate();
 
     virtual void Restore();
     virtual void Activate();
 


@@ -163,8 +165,8 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleGetMinMaxInfo(void *mmInfo);
 
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleGetMinMaxInfo(void *mmInfo);
 

-    virtual long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool MSWTranslateMessage(WXMSG *msg);
 
     virtual void MSWDestroyWindow();
     virtual bool MSWTranslateMessage(WXMSG *msg);
 
     virtual void MSWDestroyWindow();


@@ -173,11 +175,13 @@ public:
 
     void OnIdle(wxIdleEvent& event);
 
 
     void OnIdle(wxIdleEvent& event);
 

+    virtual bool Show(bool show = true);
+

 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();

-    virtual bool IsMDIChild() const { return TRUE; }
+    virtual bool IsMDIChild() const { return true; }

 
     virtual WXHICON GetDefaultIcon() const;
 
 
     virtual WXHICON GetDefaultIcon() const;
 


@@ -185,10 +189,11 @@ protected:
     void Init();
 
 private:
     void Init();
 
 private:

+    bool m_needsInitialShow; // Show must be called in idle time after Creation

     bool m_needsResize; // flag which tells us to artificially resize the frame
 
     DECLARE_EVENT_TABLE()
     bool m_needsResize; // flag which tells us to artificially resize the frame
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)

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


@@ -223,7 +228,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow)

 };
 
 #endif
 };
 
 #endif