Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 490d00170f6ac8f88c0b2784cd4cabf29f30eaa5..23dde5eab48474b4deb283597f590aea04fb42c3 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.h
+// Name:        wx/gtk/frame.h

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


@@ -12,14 +12,9 @@
 #define __GTKFRAMEH__
 
 #ifdef __GNUG__
 #define __GTKFRAMEH__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface "frame.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/icon.h"
-

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


@@ -31,100 +26,119 @@ class wxMenuBar;
 class wxToolBar;
 class wxStatusBar;
 
 class wxToolBar;
 class wxStatusBar;
 

-class wxFrame;
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// global data
+// wxFrameGTK

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
+class wxFrameGTK : public wxFrameBase
+{
+public:
+    // construction
+    wxFrameGTK() { Init(); }
+    wxFrameGTK(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+
+    virtual ~wxFrameGTK();
+
+    // implement base class pure virtuals
+    virtual void Maximize(bool maximize = TRUE);
+    virtual bool IsMaximized() const;
+    virtual void Iconize(bool iconize = TRUE);
+    virtual bool IsIconized() const;
+    virtual void SetIcon(const wxIcon& icon);
+    virtual void MakeModal(bool modal = TRUE);
+    virtual void Restore();
+
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+
+#if wxUSE_MENUS
+    virtual void SetMenuBar( wxMenuBar *menuBar );
+#endif // wxUSE_MENUS

 
 

-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
+#if wxUSE_STATUSBAR
+    virtual void PositionStatusBar();

 
 

-class wxFrame: public wxWindow
-{
-DECLARE_DYNAMIC_CLASS(wxFrame)
+    virtual wxStatusBar* CreateStatusBar(int number = 1,
+                                         long style = wxST_SIZEGRIP,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);
+#endif // wxUSE_STATUSBAR

 
 

-public:
-    wxFrame();
-    wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame();
-    bool Destroy();
-
-    virtual bool Show( bool show );
-    virtual void Centre( int direction = wxHORIZONTAL );
-
-    virtual void GetClientSize( int *width, int *height ) const;
-
-    virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = "statusBar");
-    virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
-            const wxString& name );
-    virtual wxStatusBar *GetStatusBar() const;
-    inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
-    virtual void SetStatusText( const wxString &text, int number = 0 );
-    virtual void SetStatusWidths( int n, const int widths_field[] );
-
-    virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,
-            const wxString& name = wxToolBarNameStr);
-    virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
-    virtual wxToolBar *GetToolBar() const;
-    inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+#if wxUSE_TOOLBAR
+    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);
+    void SetToolBar(wxToolBar *toolbar);
+#endif // wxUSE_TOOLBAR

 
 

-    virtual void SetMenuBar( wxMenuBar *menuBar );
-    virtual wxMenuBar *GetMenuBar() const;
+    virtual bool Show(bool show = TRUE);

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

-    virtual void SetIcon( const wxIcon &icon );
-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }
-    bool Iconized() const { return IsIconized(); }
-    virtual void Maximize(bool WXUNUSED(maximize)) {}
-    virtual void Restore() {}
-
-    virtual void Command( int id );
-    
-    void OnCloseWindow( wxCloseEvent& event );
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
-    void OnSize( wxSizeEvent &event );
-
-    void OnMenuHighlight( wxMenuEvent& event );
+    // implementation from now on
+    // --------------------------

 
 

-    // implementation
+    // move the window to the specified location and resize it: this is called
+    // from both DoSetSize() and DoSetClientSize()
+    virtual void DoMoveWindow(int x, int y, int width, int height);

 
 

+    // GTK callbacks

     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void GtkOnSize( int x, int y, int width, int height );

-    virtual wxPoint GetClientAreaOrigin() const;
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);

     virtual void OnInternalIdle();
 
     virtual void OnInternalIdle();
 

-    wxMenuBar    *m_frameMenuBar;
-    wxMenuBar    *m_mdiMenuBar;
-    wxStatusBar  *m_frameStatusBar;
-    wxToolBar    *m_frameToolBar;
+    // do *not* call this to iconize the frame, this is a private function!
+    void SetIconizeState(bool iconic);
+

     wxString      m_title;
     wxString      m_title;

-    wxIcon        m_icon;
-    int           m_miniEdge,m_miniTitle;
+    int           m_miniEdge,
+                  m_miniTitle;
+    GtkWidget    *m_mainWidget;
+    bool          m_menuBarDetached;
+    bool          m_toolBarDetached;
+    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
+
+    bool          m_fsIsShowing;         /* full screen */
+    long          m_fsSaveStyle;
+    long          m_fsSaveFlag;
+    wxRect        m_fsSaveFrame;

 
 protected:
 
 protected:

+    // common part of all ctors
+    void Init();
+
+    // override wxWindow methods to take into account tool/menu/statusbars

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     virtual void DoSetClientSize(int width, int height);
     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;
+
+    // is the frame currently iconized?
+    bool          m_isIconized;

 
 private:
 
 private:

-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxFrameGTK)

 };
 
 #endif // __GTKFRAMEH__
 };
 
 #endif // __GTKFRAMEH__