Move wxMBConv_cf out of strconv.cpp and into strconv_cf.(cpp|h) by forking the files...

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 5711e9833829d2e00ae758e08f7b23791d82c5a0..f65413146ce68939fd4c37f5b67a5cbeb5ffa596 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_

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


@@ -69,13 +69,14 @@ public:
     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); }
 
     // implementation from now on
     // --------------------------
 
     // GTK callbacks
     wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 
     // implementation from now on
     // --------------------------
 
     // GTK callbacks

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

     virtual void OnInternalIdle();
 
     bool          m_menuBarDetached;
     virtual void OnInternalIdle();
 
     bool          m_menuBarDetached;


@@ -91,7 +92,6 @@ protected:
 #endif // wxUSE_STATUSBAR
 
     // override wxWindow methods to take into account tool/menu/statusbars
 #endif // wxUSE_STATUSBAR
 
     // 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


@@ -105,7 +105,10 @@ public:
 
 #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_