X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ca41e57f48db4c1a2de7ae67c7e4b655d9809af..24126cdde89f84898297572fdaf638c94d7105a0:/include/wx/gtk1/frame.h?ds=sidebyside

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 38f27d5375..4470508567 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -18,6 +18,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"
+#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -36,8 +37,8 @@ class wxFrame;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
+extern const wxChar *wxFrameNameStr;
+extern const wxChar *wxToolBarNameStr;
 
 //-----------------------------------------------------------------------------
 // wxFrame
@@ -45,73 +46,100 @@ extern const char *wxToolBarNameStr;
 
 class wxFrame: public wxWindow
 {
-  DECLARE_DYNAMIC_CLASS(wxFrame)
-public:
+DECLARE_DYNAMIC_CLASS(wxFrame)
 
-  wxFrame();
-  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 );
-
-  virtual void GetClientSize( int *width, int *height ) const;
-  virtual void SetClientSize( int const width, int const height );
-
-  virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-    const wxString& name = "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[] );
-
-  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(void) const;
-  inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
-
-  virtual void SetMenuBar( wxMenuBar *menuBar );
-  virtual wxMenuBar *GetMenuBar() const;
-
-  virtual void SetTitle( const wxString &title );
-  virtual wxString GetTitle() const { return m_title; }
-
-  virtual void SetIcon( const wxIcon &icon );
-  virtual void Iconize( bool WXUNUSED(iconize)) { }
-  virtual bool IsIconized(void) const { return FALSE; }
-  bool Iconized(void) const { return IsIconized(); }
-  virtual void Maximize(bool WXUNUSED(maximize)) {}
-  virtual void Restore(void) {}
-
-  void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
-  void OnSize( wxSizeEvent &event );
-  void OnCloseWindow( wxCloseEvent& event );
-  void OnIdle(wxIdleEvent& event);
-
-  // implementation
-  
-  virtual void GtkOnSize( int x, int y, int width, int height );
-  virtual void ImplementSetPosition();
-  virtual wxPoint GetClientAreaOrigin() const;
-  void DoMenuUpdates();
-  void DoMenuUpdates(wxMenu* menu);
-
-  wxMenuBar    *m_frameMenuBar;
-  wxStatusBar  *m_frameStatusBar;
-  wxToolBar    *m_frameToolBar;
-  wxString      m_title;
-  wxIcon        m_icon;
-
-  DECLARE_EVENT_TABLE()
+public:
+    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 );
+
+#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[] );
+#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; }
+#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 );
+    bool Iconized() const { return IsIconized(); }
+    virtual void Maximize( bool maximize );
+    virtual void Restore();
+    virtual void Iconize( bool iconize );
+    virtual bool IsIconized() const;
+
+    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 );
+
+    // implementation
+
+    virtual void GtkOnSize( int x, int y, int width, int height );
+    void DoMenuUpdates();
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+    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();
+    
+    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;
+
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKFRAMEH__