wxCoordRound() -> wxRound()

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

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index a4533d6237fc40af9f72dff4c5109d9b497b6065..e27da81e02ed5cedfdefa6e81fc563978808f44f 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


@@ -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,


@@ -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,12 @@ 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);
+    void DoSetSizeHints(int minW = wxDefaultCoord,
+                        int minH = wxDefaultCoord,
+                        int maxW = wxDefaultCoord,
+                        int maxH = wxDefaultCoord,
+                        int incW = wxDefaultCoord,
+                        int incH = wxDefaultCoord);

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


@@ -218,7 +219,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);