make access for virtuals match base

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 97cec7f13b1da2c75fd316b42275e3c299128784..c24937ec95ea453df13c4c8ee83de41f88635a1e 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -7,43 +7,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
-
-#ifdef __GNUG__
-    #pragma interface "frame.h"
-#endif
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMDIChildFrame;
-class wxMDIClientWindow;
-class wxMenu;
-class wxMenuBar;
-class wxToolBar;
-class wxStatusBar;
-
-class wxFrame;
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_

 
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
 

-class wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase

 {
 public:
     // construction
     wxFrame() { Init(); }
     wxFrame(wxWindow *parent,
 {
 public:
     // construction
     wxFrame() { Init(); }
     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)
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -60,65 +42,44 @@ public:
 
     virtual ~wxFrame();
 
 
     virtual ~wxFrame();
 

-    // 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 void SetMenuBar( wxMenuBar *menuBar );
-

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-    virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_SIZEGRIP,
-                                         wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
+    void SetStatusBar(wxStatusBar *statbar);

 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
 #endif // wxUSE_STATUSBAR
 
 #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
 
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 

-    virtual bool Show(bool show);
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }

 
 

-    virtual void SetTitle( const wxString &title );
-    virtual wxString GetTitle() const { return m_title; }
+#if wxUSE_LIBHILDON
+    // in Hildon environment all frames are always shown maximized
+    virtual bool IsMaximized() const { return true; }
+#endif // wxUSE_LIBHILDON

 
     // implementation from now on
     // --------------------------
 
     // GTK callbacks
 
     // implementation from now on
     // --------------------------
 
     // GTK callbacks

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

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

-    wxString      m_title;
-    int           m_miniEdge,
-                  m_miniTitle;
-    GtkWidget    *m_mainWidget;
-    bool          m_menuBarDetached;
-    bool          m_toolBarDetached;
-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
-

 protected:
     // common part of all ctors
     void Init();
 
 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);
+    // override wxWindow methods to take into account tool/menu/statusbars

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

+#if wxUSE_MENUS_NATIVE
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS_NATIVE
+

 private:
 private:

+    long m_fsSaveFlag;
+

     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 

-#endif // __GTKFRAMEH__
+#endif // _WX_GTK_FRAME_H_