Fix bug with using invalid date in wxMSW wxCalendarCtrl.

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

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

-
-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "frame.h"
-#endif
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIChildFrame;
-class WXDLLIMPEXP_CORE wxMDIClientWindow;
-class WXDLLIMPEXP_CORE wxMenu;
-class WXDLLIMPEXP_CORE wxMenuBar;
-class WXDLLIMPEXP_CORE wxToolBar;
-class WXDLLIMPEXP_CORE wxStatusBar;
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_

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


@@ -59,56 +43,42 @@ 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 || wxUSE_LIBHILDON2
+    // in Hildon environment all frames are always shown maximized
+    virtual bool IsMaximized() const { return true; }
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+

     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------
 

-    // GTK callbacks
-    virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual void OnInternalIdle();
-
-    bool          m_menuBarDetached;
-    int           m_menuBarHeight;
-    bool          m_toolBarDetached;
+    virtual bool SendIdleEvents(wxIdleEvent& event);

 
 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_