wxCoordRound() -> wxRound()

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 08a518e3c2be38d572d13cbb1ebe8f80f971ca6c..3ccf1b4d7fa71949c2b0fcac1ab15072c41a8d36 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/mdi.h
+// Name:        wx/gtk1/mdi.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __MDIH__
 #define __MDIH__
 
 #ifndef __MDIH__
 #define __MDIH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"


@@ -27,22 +22,21 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxMDIParentFrame;
-class wxMDIClientWindow;
-class wxMDIChildFrame;
+class WXDLLIMPEXP_CORE wxMDIParentFrame;
+class WXDLLIMPEXP_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_CORE wxMDIChildFrame;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

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

 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxMDIParentFrame() { Init(); }
 {
 public:
     wxMDIParentFrame() { Init(); }


@@ -59,21 +53,22 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
         (void)Create(parent, id, title, pos, size, style, name);
     }
 

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

     bool Create( wxWindow *parent,
     bool Create( wxWindow *parent,

-       wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-       const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                 const wxString& name = wxFrameNameStr );

 
 

-    void GetClientSize(int *width, int *height) const;

     wxMDIChildFrame *GetActiveChild() const;
 
     wxMDIClientWindow *GetClientWindow() const;
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
     wxMDIChildFrame *GetActiveChild() const;
 
     wxMDIClientWindow *GetClientWindow() const;
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}

-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}

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


@@ -89,6 +84,8 @@ public:
 protected:
     void Init();
 
 protected:
     void Init();
 

+    virtual void DoGetClientSize(int *width, int *height) const;
+

 private:
     friend class wxMDIChildFrame;
 
 private:
     friend class wxMDIChildFrame;
 


@@ -99,24 +96,30 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxMDIChildFrame();
     wxMDIChildFrame( wxMDIParentFrame *parent,
 {
 public:
     wxMDIChildFrame();
     wxMDIChildFrame( wxMDIParentFrame *parent,

-      wxWindowID id, const wxString& title,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
-    ~wxMDIChildFrame();
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE,
+                     const wxString& name = wxFrameNameStr );
+
+    virtual ~wxMDIChildFrame();

     bool Create( wxMDIParentFrame *parent,
     bool Create( wxMDIParentFrame *parent,

-      wxWindowID id, const wxString& title,
-      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE,
+                 const wxString& name = wxFrameNameStr );

 
     virtual void SetMenuBar( wxMenuBar *menu_bar );
     virtual wxMenuBar *GetMenuBar() const;
 
 
     virtual void SetMenuBar( wxMenuBar *menu_bar );
     virtual wxMenuBar *GetMenuBar() const;
 

-    virtual void GetClientSize( int *width, int *height ) const;

     virtual void AddChild( wxWindowBase *child );
 
     virtual void Activate();
     virtual void AddChild( wxWindowBase *child );
 
     virtual void Activate();


@@ -135,29 +138,39 @@ public:
 #endif
 
     // no size hints
 #endif
 
     // no size hints

-    virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
-                               int WXUNUSED(maxW), int WXUNUSED(maxH),
-                               int WXUNUSED(incW), int WXUNUSED(incH) ) {}
+    virtual void DoSetSizeHints( int WXUNUSED(minW),
+                                 int WXUNUSED(minH),
+                                 int WXUNUSED(maxW) = wxDefaultCoord,
+                                 int WXUNUSED(maxH) = wxDefaultCoord,
+                                 int WXUNUSED(incW) = wxDefaultCoord,
+                                 int WXUNUSED(incH) = wxDefaultCoord) {}

 
 #if wxUSE_TOOLBAR
 
 #if wxUSE_TOOLBAR

-    // no toolbar bars
-    virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),
-        const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
+    // no toolbar
+    virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
+                                       wxWindowID WXUNUSED(id),
+                                       const wxString& WXUNUSED(name) )
+        { return (wxToolBar*)NULL; }

     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }

-#endif
+#endif // wxUSE_TOOLBAR

 
     // no icon
 
     // no icon

-    void SetIcon( const wxIcon &icon ) { m_icon = icon; }
+    virtual void SetIcon(const wxIcon& icon)
+        { wxTopLevelWindowBase::SetIcon(icon); }
+    virtual void SetIcons(const wxIconBundle& icons )
+        { wxTopLevelWindowBase::SetIcons(icons); }

 
     // no title
 
     // no title

-    void SetTitle( const wxString &title );
-    wxString GetTitle() const { return m_title; }
+    virtual void SetTitle( const wxString &title );

 
     // no maximize etc
 
     // no maximize etc

-    virtual void Maximize( bool WXUNUSED(maximize) ) {}
+    virtual void Maximize( bool WXUNUSED(maximize) = true ) { }
+    virtual bool IsMaximized() const { return true; }
+    virtual void Iconize(bool WXUNUSED(iconize) = true) { }
+    virtual bool IsIconized() const { return false; }

     virtual void Restore() {}
 
     virtual void Restore() {}
 

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

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


@@ -168,6 +181,14 @@ public:
     GtkNotebookPage   *m_page;
     bool               m_justInserted;
 
     GtkNotebookPage   *m_page;
     bool               m_justInserted;
 

+protected:
+    // override wxFrame methods to not do anything
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
+    virtual void DoGetClientSize( int *width, int *height ) const;
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)


@@ -177,12 +198,12 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-class wxMDIClientWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow

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

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

     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
 private:
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
 private:


@@ -190,4 +211,3 @@ private:
 };
 
 #endif // __MDIH__
 };
 
 #endif // __MDIH__

-