fix warnings in EventsSuppressor ctor from gcc with -O option

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index b69144382b3b106930b538ce9786cd40cee38bbe..98addeee0453425a1d437d8f4da75a53338db667 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.h
+// Name:        wx/gtk/frame.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,139 +7,74 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/icon.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMDIChildFrame;
-class wxMDIClientWindow;
-class wxMenu;
-class wxMenuBar;
-class wxToolBar;
-class wxStatusBar;
-
-class wxFrame;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxFrameNameStr;
-extern const wxChar *wxToolBarNameStr;
+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_

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

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxFrame)
-

 public:
 public:

+    // construction

     wxFrame() { Init(); }
     wxFrame() { Init(); }

-    wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame();
-    bool Destroy();
-
-    virtual bool Show( bool show );
-    virtual void Centre( int direction = wxHORIZONTAL );
+    wxFrame(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+
+    virtual ~wxFrame();

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = _T("statusBar"));
-    virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
-            const wxString& name );
-    virtual wxStatusBar *GetStatusBar() const;
-    inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
-    virtual void SetStatusText( const wxString &text, int number = 0 );
-    virtual void SetStatusWidths( int n, const int widths_field[] );
+    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, wxWindowID id = -1,
-            const wxString& name = wxToolBarNameStr);
-    virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
-    virtual wxToolBar *GetToolBar() const;
-    void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+    void SetToolBar(wxToolBar *toolbar);

 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR
 

-    virtual void SetMenuBar( wxMenuBar *menuBar );
-    virtual wxMenuBar *GetMenuBar() const;
-
-    virtual void SetTitle( const wxString &title );
-    virtual wxString GetTitle() const { return m_title; }
-
-        // make the window modal (all other windows unresponsive)
-    virtual void MakeModal(bool modal = TRUE);
-
-    virtual void SetIcon( const wxIcon &icon );
-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }
-    bool Iconized() const { return IsIconized(); }
-    virtual void Maximize(bool WXUNUSED(maximize)) {}
-    virtual void Restore() {}
-
-    virtual void Command( int id );
-    
-    void OnCloseWindow( wxCloseEvent& event );
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
-    void OnSize( wxSizeEvent &event );
-
-    void OnMenuHighlight( wxMenuEvent& event );
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }

 
 

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

 
 

-    virtual void GtkOnSize( int x, int y, int width, int height );
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+    // GTK callbacks

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

-    wxMenuBar    *m_frameMenuBar;
-#if wxUSE_STATUSBAR
-    wxStatusBar  *m_frameStatusBar;
-#endif
-#if wxUSE_TOOLBAR
-    wxToolBar    *m_frameToolBar;
-#endif
-    wxString      m_title;
-    wxIcon        m_icon;
-    int           m_miniEdge,m_miniTitle;
-    GtkWidget    *m_mainWidget;
-    bool          m_menuBarDetached;
-    bool          m_toolBarDetached;
-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
-

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();

-    
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);

 
 

-    virtual void DoSetClientSize(int width, int height);
+    // override wxWindow methods to take into account tool/menu/statusbars

     virtual void DoGetClientSize( int *width, int *height ) const;
 
     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:
 private:

-    DECLARE_EVENT_TABLE()
+    long m_fsSaveFlag;
+
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 };
 

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