Applied patch [ 679397 ] remove GPL code from motif build

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 23dde5eab48474b4deb283597f590aea04fb42c3..d4ec4bc940dafa4260ee4f773ed266ef38c35ef0 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -11,7 +11,7 @@
 #ifndef __GTKFRAMEH__
 #define __GTKFRAMEH__
 
 #ifndef __GTKFRAMEH__
 #define __GTKFRAMEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "frame.h"
 #endif
 
     #pragma interface "frame.h"
 #endif
 


@@ -27,15 +27,15 @@ class wxToolBar;
 class wxStatusBar;
 
 //-----------------------------------------------------------------------------
 class wxStatusBar;
 
 //-----------------------------------------------------------------------------

-// wxFrameGTK
+// wxFrame

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

-class wxFrameGTK : public wxFrameBase
+class 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,23 +56,7 @@ 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
     virtual void PositionStatusBar();
 
 #if wxUSE_STATUSBAR
     virtual void PositionStatusBar();


@@ -89,56 +73,40 @@ public:
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR

-
-    virtual bool Show(bool show = TRUE);
-
-    virtual void SetTitle( const wxString &title );
-    virtual wxString GetTitle() const { return m_title; }
+    
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }

 
     // 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();
 
     // 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_menuBarDetached;

+    int           m_menuBarHeight;

     bool          m_toolBarDetached;
     bool          m_toolBarDetached;

-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
-
-    bool          m_fsIsShowing;         /* full screen */
-    long          m_fsSaveStyle;
-    long          m_fsSaveFlag;
-    wxRect        m_fsSaveFrame;

 
 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 DoSetClientSize(int width, int height);
     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);
+
+public:
+    // Menu size is dynamic now, call this whenever it might change.
+    void UpdateMenuBarSize();
+
+#endif // wxUSE_MENUS_NATIVE

 
 

-private:
-    DECLARE_DYNAMIC_CLASS(wxFrameGTK)
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif // __GTKFRAMEH__
 };
 
 #endif // __GTKFRAMEH__