Minor corrections to make dist after reports

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 5d2327f007391e74940f7d1c28ff9badf63a3f4a..c24937ec95ea453df13c4c8ee83de41f88635a1e 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -4,33 +4,17 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

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

-
-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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_

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

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

 {
 public:
     // construction
 {
 public:
     // construction


@@ -59,56 +43,43 @@ public:
     virtual ~wxFrame();
 
 #if wxUSE_STATUSBAR
     virtual ~wxFrame();
 
 #if wxUSE_STATUSBAR

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

     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-    virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);

     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR

-    
+
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

     wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 
     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
     // implementation from now on
     // --------------------------
 
     // GTK callbacks

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

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

-    bool          m_menuBarDetached;
-    int           m_menuBarHeight;
-    bool          m_toolBarDetached;
-

 protected:
     // common part of all ctors
     void Init();
 
     // override wxWindow methods to take into account tool/menu/statusbars
 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 DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE

-

     virtual void DetachMenuBar();
     virtual void AttachMenuBar(wxMenuBar *menubar);
     virtual void DetachMenuBar();
     virtual void AttachMenuBar(wxMenuBar *menubar);

-
-public:
-    // Menu size is dynamic now, call this whenever it might change.
-    void UpdateMenuBarSize();
-

 #endif // wxUSE_MENUS_NATIVE
 
 #endif // wxUSE_MENUS_NATIVE
 

+private:
+    long m_fsSaveFlag;
+

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

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