fixed off by one error in wxXPMDecoder::ReadFile

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 22fe70b2c47b0edafc20d8cb2c8b1ad65e34b793..3dd4ca65303d3f93f039142f354d7465a4a3c104 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -22,6 +21,7 @@
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/frame.h"
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/frame.h"

+#include "wx/toolbar.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -35,8 +35,8 @@ class wxMDIChildFrame;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char* wxFrameNameStr;
-extern const char* wxStatusLineNameStr;
+extern const wxChar* wxFrameNameStr;
+extern const wxChar* wxStatusLineNameStr;

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


@@ -44,85 +44,150 @@ extern const char* wxStatusLineNameStr;
 
 class wxMDIParentFrame: public wxFrame
 {
 
 class wxMDIParentFrame: public wxFrame
 {

-  DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-
-  friend class wxMDIChildFrame;
-  
-  public:
-
-    wxMDIParentFrame(void);
-    wxMDIParentFrame( 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 );
-  ~wxMDIParentFrame(void);
-   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 );
-
-  void OnSize( wxSizeEvent& event );
-  void OnActivate( wxActivateEvent& event );
-
-  void SetMenuBar( wxMenuBar *menu_bar );
-  void GetClientSize(int *width, int *height) const;
-  wxMDIChildFrame *GetActiveChild(void) const;
-  
-  wxMDIClientWindow *GetClientWindow(void) const; 
-  virtual wxMDIClientWindow *OnCreateClient(void);
-  
-  virtual void Cascade(void) {};
-  virtual void Tile(void) {};
-  virtual void ArrangeIcons(void) {};
-  virtual void ActivateNext(void);
-  virtual void ActivatePrevious(void);
-
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
-    
- protected:
-    wxMDIClientWindow *             m_clientWindow;
-    wxMDIChildFrame *               m_currentChild;
-    bool                            m_parentFrameActive;
-
-//  DECLARE_EVENT_TABLE()    
+public:
+    wxMDIParentFrame() { Init(); }
+    wxMDIParentFrame(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)
+    {
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);
+    }
+
+    ~wxMDIParentFrame();
+    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 );
+
+    wxMDIChildFrame *GetActiveChild() const;
+
+    wxMDIClientWindow *GetClientWindow() const;
+    virtual wxMDIClientWindow *OnCreateClient();
+
+    virtual void Cascade() {}
+    virtual void Tile() {}
+    virtual void ArrangeIcons() {}
+    virtual void ActivateNext();
+    virtual void ActivatePrevious();
+
+    // implementation
+
+    wxMDIClientWindow  *m_clientWindow;
+    bool                m_justInserted;
+
+    virtual void GtkOnSize( int x, int y, int width, int height );
+    virtual void OnInternalIdle();
+
+protected:
+    void Init();
+
+    virtual void DoGetClientSize(int *width, int *height) const;
+
+private:
+    friend class wxMDIChildFrame;
+
+    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)

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

-class wxMDIChildFrame: public wxPanel
+class wxMDIChildFrame: public wxFrame

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-  
-  public:
-
-    wxMDIChildFrame(void);
+public:
+    wxMDIChildFrame();

     wxMDIChildFrame( wxMDIParentFrame *parent,
     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(void);
+                     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 );
-    void SetMenuBar( wxMenuBar *menu_bar );
-
-    // no status bars in wxGTK
-    virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
-    virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
-    virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
-
-    virtual void Maximize(void) {};
-    virtual void Restore(void) {};
-    virtual void Activate(void);
-    
-  public:
-  
-    wxString    m_title;
+                 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 AddChild( wxWindowBase *child );
+
+    virtual void Activate();
+
+#if wxUSE_STATUSBAR
+    // no status bars
+    virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
+                                        long WXUNUSED(style) = 1,
+                                        wxWindowID WXUNUSED(id) = 1,
+                                        const wxString& WXUNUSED(name) = wxEmptyString)
+      { return (wxStatusBar*)NULL; }
+
+    virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
+    virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
+    virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
+#endif
+
+    // no size hints
+    virtual void SetSizeHints( int WXUNUSED(minW),
+                               int WXUNUSED(minH),
+                               int WXUNUSED(maxW) = -1,
+                               int WXUNUSED(maxH) = -1,
+                               int WXUNUSED(incW) = -1,
+                               int WXUNUSED(incH) = -1) {}
+
+#if wxUSE_TOOLBAR
+    // no toolbar bars
+    virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
+                                       wxWindowID WXUNUSED(id),
+                                       const wxString& WXUNUSED(name) )
+        { return (wxToolBar*)NULL; }
+    virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
+#endif
+
+    // no icon
+    void SetIcon( const wxIcon &icon ) { m_icon = icon; }
+
+    // no title
+    void SetTitle( const wxString &title );
+    wxString GetTitle() const { return m_title; }
+
+    // no maximize etc
+    virtual void Maximize( bool WXUNUSED(maximize) ) {}
+    virtual void Restore() {}
+
+    virtual bool IsTopLevel() const { return FALSE; }
+
+    void OnActivate( wxActivateEvent& event );
+    void OnMenuHighlight( wxMenuEvent& event );
+
+    // implementation
+
+    wxMenuBar         *m_menuBar;
+    GtkNotebookPage   *m_page;
+    bool               m_justInserted;
+
+protected:
+    virtual void DoGetClientSize( int *width, int *height ) const;
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)

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


@@ -131,15 +196,14 @@ class wxMDIChildFrame: public wxPanel
 
 class wxMDIClientWindow: public wxWindow
 {
 
 class wxMDIClientWindow: public wxWindow
 {

-  DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-  
-  public:
-  
-    wxMDIClientWindow(void);
+public:
+    wxMDIClientWindow();

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

-    ~wxMDIClientWindow(void);
+    ~wxMDIClientWindow();

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

-    void AddChild( wxWindow *child );
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

 };
 
 #endif // __MDIH__
 };
 
 #endif // __MDIH__