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 fd7e72f4d36ce68eeece9b9a82887d413c84cbf2..f65f85ee628171d7ad9f480164a54e807ea8b803 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -7,35 +7,19 @@
 // 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;
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxFrameGTK
+// wxFrame

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

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

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

-    wxFrameGTK() { Init(); }
-    wxFrameGTK(wxWindow *parent,
+    wxFrame() { Init(); }
+    wxFrame(wxWindow *parent,

                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,
                wxWindowID id,
                const wxString& title,
                const wxPoint& pos = wxDefaultPosition,


@@ -56,86 +40,45 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    virtual ~wxFrameGTK();
-
-    // 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 bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
-
-#if wxUSE_MENUS
-    virtual void SetMenuBar( wxMenuBar *menuBar );
-#endif // wxUSE_MENUS
+    virtual ~wxFrame();

 
 #if wxUSE_STATUSBAR
 
 #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
 #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 = TRUE);
+    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 || 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
     // --------------------------
 

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-    // GTK callbacks
-    virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual void OnInternalIdle();
-
-    // do *not* call this to iconize the frame, this is a private function!
-    void SetIconizeState(bool iconic);
-
-    wxString      m_title;
-    int           m_miniEdge,
-                  m_miniTitle;
-    GtkWidget    *m_mainWidget;
-    bool          m_menuBarDetached;
-    bool          m_toolBarDetached;
-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
-
-    bool          m_fsIsShowing;         /* full screen */
-    long          m_fsSaveStyle;
-    long          m_fsSaveFlag;
-    wxRect        m_fsSaveFrame;
+    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 DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    virtual void DoSetClientSize(int width, int height);

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

-    // is the frame currently iconized?
-    bool          m_isIconized;
+#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_