minor fixes

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index fc73faa091b25db875a66fb958fe0f4fc7cfa4b1..6dda00580119a965672c94caacbdc05a72dfdb85 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -37,8 +37,8 @@ class wxFrame;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
+extern const wxChar *wxFrameNameStr;
+extern const wxChar *wxToolBarNameStr;
 
 //-----------------------------------------------------------------------------
 // wxFrame
@@ -65,7 +65,7 @@ public:
     virtual void GetClientSize( int *width, int *height ) const;
 
     virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = "statusBar");
+            const wxString& name = _T("statusBar"));
     virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
             const wxString& name );
     virtual wxStatusBar *GetStatusBar() const;
@@ -92,6 +92,8 @@ public:
     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 );
@@ -101,18 +103,19 @@ public:
     // implementation
 
     virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual wxPoint GetClientAreaOrigin() const;
     void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu);
+    void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
     virtual void OnInternalIdle();
 
     wxMenuBar    *m_frameMenuBar;
-    wxMenuBar    *m_mdiMenuBar;
     wxStatusBar  *m_frameStatusBar;
     wxToolBar    *m_frameToolBar;
     wxString      m_title;
     wxIcon        m_icon;
     int           m_miniEdge,m_miniTitle;
+    GtkWidget    *m_mainWidget;
+    bool          m_menuBarDetached;
+    bool          m_toolBarDetached;
 
 protected:
     virtual void DoSetSize(int x, int y,