removed wxDCWindowImpl::m_win; use wxDCImpl::m_window instead (fixes caret-related...

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index ec5261621e5150802c0c573f8e5a4d87ec9ca20a..c24937ec95ea453df13c4c8ee83de41f88635a1e 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -7,35 +7,19 @@
 // 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;
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_
 
 //-----------------------------------------------------------------------------
-// wxFrameGTK
+// wxFrame
 //-----------------------------------------------------------------------------
 
-class wxFrameGTK : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
 {
 public:
     // construction
-    wxFrameGTK() { Init(); }
-    wxFrameGTK(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,
@@ -56,46 +40,46 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxFrameGTK();
+    virtual ~wxFrame();
 
 #if wxUSE_STATUSBAR
-    virtual void PositionStatusBar();
-
-    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
-    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 bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
+
+#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
-    virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
-    bool          m_menuBarDetached;
-    bool          m_toolBarDetached;
-
 protected:
     // common part of all ctors
     void Init();
 
     // override wxWindow methods to take into account tool/menu/statusbars
-    virtual void DoSetClientSize(int width, int height);
     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:
+    long m_fsSaveFlag;
+
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
-#endif // __GTKFRAMEH__
+#endif // _WX_GTK_FRAME_H_