Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index aacd0b427482ab20f71d2d9c80b6656a2f4a7491..f65f85ee628171d7ad9f480164a54e807ea8b803 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -1,90 +1,84 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_FRAME_H_
+#define _WX_GTK_FRAME_H_

 
 

-#ifndef __GTKFRAMEH__
-#define __GTKFRAMEH__
+//-----------------------------------------------------------------------------
+// wxFrame
+//-----------------------------------------------------------------------------

 
 

-#ifdef __GNUG__
-#pragma interface
-#endif
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
+{
+public:
+    // construction
+    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)
+    {
+        Init();

 
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/menu.h"
-#include "wx/statusbr.h"
+        Create(parent, id, title, pos, size, style, name);
+    }

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+    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);

 
 

-class wxRadioBox;
+    virtual ~wxFrame();

 
 

-class wxFrame;
+#if wxUSE_STATUSBAR
+    void SetStatusBar(wxStatusBar *statbar);
+#endif // wxUSE_STATUSBAR

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+#if wxUSE_TOOLBAR
+    void SetToolBar(wxToolBar *toolbar);
+#endif // wxUSE_TOOLBAR

 
 

-extern const char *wxFrameNameStr;
+    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }

 
 

-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
+#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

 
 

-class wxFrame: public wxWindow
-{
-  DECLARE_DYNAMIC_CLASS(wxFrame)
-
-  public:
-  
-    wxFrame(void);
-    wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id, const wxString &title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame(void);
-    bool Destroy(void);
-    void OnCloseWindow( wxCloseEvent& event );
-    virtual bool Show( const bool show );
-    virtual void Enable( const bool enable );
-    virtual void GetClientSize( int *width, int *height ) const;
-    void OnSize( wxSizeEvent &event );
-    void SetMenuBar( wxMenuBar *menuBar );
-    virtual bool CreateStatusBar( const int number = 1 );
-    virtual void SetStatusText( const wxString &text, const int number = 0 );
-    virtual void SetStatusWidths( const int n, const int *width );
-    wxStatusBar *GetStatusBar(void);
-    wxMenuBar *GetMenuBar(void);
-    void SetTitle( const wxString &title );
-    wxString GetTitle(void) const;
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
-    
-    void GtkOnSize( int width, int height );
-    
-  private:
-  
-    friend        wxWindow;
-    
-    GtkWidget    *m_mainWindow;
-    wxMenuBar    *m_frameMenuBar;
-    wxStatusBar  *m_frameStatusBar;
-    bool          m_doingOnSize;
-    wxString      m_title;
-    
-    
-  DECLARE_EVENT_TABLE()
-    
+    // implementation from now on
+    // --------------------------
+
+    virtual bool SendIdleEvents(wxIdleEvent& event);
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // override wxWindow methods to take into account tool/menu/statusbars
+    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:
+    long m_fsSaveFlag;
+
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 };
 

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