Minor corrections to make dist after reports

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

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index a4533d6237fc40af9f72dff4c5109d9b497b6065..fa8e5a736f9df7fb48dabb04818983897f551b89 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     MDI (Multiple Document Interface) classes.
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     MDI (Multiple Document Interface) classes.
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "mdi.h"
-#endif
-

 /*
 New MDI scheme using tabs. We can use a wxNotebook to implement the client
 window. wxMDIChildFrame can be implemented as an XmMainWindow widget
 /*
 New MDI scheme using tabs. We can use a wxNotebook to implement the client
 window. wxMDIChildFrame can be implemented as an XmMainWindow widget


@@ -27,14 +23,14 @@ but wxMDIChildFrame::GetParent should return the parent frame.
 #include "wx/frame.h"
 #include "wx/notebook.h"
 
 #include "wx/frame.h"
 #include "wx/notebook.h"
 

-class WXDLLEXPORT wxMDIClientWindow;
-class WXDLLEXPORT wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 
 

-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
 {
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 

-        friend class WXDLLEXPORT wxMDIChildFrame;
+        friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 public:
 
     wxMDIParentFrame();
 public:
 
     wxMDIParentFrame();


@@ -49,7 +45,7 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxMDIParentFrame();
+    virtual ~wxMDIParentFrame();

 
     bool Create(wxWindow *parent,
         wxWindowID id,
 
     bool Create(wxWindow *parent,
         wxWindowID id,


@@ -116,7 +112,7 @@ protected:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame

 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 
 {
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 


@@ -133,7 +129,7 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxMDIChildFrame();
+    virtual ~wxMDIChildFrame();

 
     bool Create(wxMDIParentFrame *parent,
         wxWindowID id,
 
     bool Create(wxMDIParentFrame *parent,
         wxWindowID id,


@@ -156,7 +152,6 @@ public:
     void ReleaseMouse();
     void Raise();
     void Lower(void);
     void ReleaseMouse();
     void Raise();
     void Lower(void);

-    void DoSetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1);

 
     // MDI operations
     virtual void Maximize();
 
     // MDI operations
     virtual void Maximize();


@@ -198,6 +193,9 @@ protected:
     void DoGetClientSize(int *width, int *height) const;
     void DoGetSize(int *width, int *height) const;
     void DoGetPosition(int *x, int *y) const ;
     void DoGetClientSize(int *width, int *height) const;
     void DoGetSize(int *width, int *height) const;
     void DoGetPosition(int *x, int *y) const ;

+    void DoSetSizeHints(int minW, int minH,
+                        int maxW, int maxH,
+                        int incW, int incH);

 };
 
 /* The client window is a child of the parent MDI frame, and itself
 };
 
 /* The client window is a child of the parent MDI frame, and itself


@@ -207,7 +205,7 @@ protected:
 * of the children. Phew! So the children are sort of 'adopted'...
 */
 
 * of the children. Phew! So the children are sort of 'adopted'...
 */
 

-class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxNotebook

 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 
 {
     DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 


@@ -218,7 +216,7 @@ public:
         CreateClient(parent, style);
     }
 
         CreateClient(parent, style);
     }
 

-    ~wxMDIClientWindow();
+    virtual ~wxMDIClientWindow();

 
     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);
 
     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL);


@@ -227,7 +225,7 @@ public:
     void OnScroll(wxScrollEvent& event);
 
     // Implementation
     void OnScroll(wxScrollEvent& event);
 
     // Implementation

-    void OnPageChanged(wxNotebookEvent& event);
+    void OnPageChanged(wxBookCtrlEvent& event);

 
     int FindPage(const wxNotebookPage* page);
 
 
     int FindPage(const wxNotebookPage* page);