Slightly better style?

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 490d00170f6ac8f88c0b2784cd4cabf29f30eaa5..6dda00580119a965672c94caacbdc05a72dfdb85 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -37,8 +37,8 @@ class wxFrame;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
+extern const wxChar *wxFrameNameStr;
+extern const wxChar *wxToolBarNameStr;

 
 //-----------------------------------------------------------------------------
 // wxFrame
 
 //-----------------------------------------------------------------------------
 // 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,
     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;
     virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
             const wxString& name );
     virtual wxStatusBar *GetStatusBar() const;


@@ -103,18 +103,19 @@ public:
     // implementation
 
     virtual void GtkOnSize( int x, int y, int width, int height );
     // implementation
 
     virtual void GtkOnSize( int x, int y, int width, int height );

-    virtual wxPoint GetClientAreaOrigin() const;

     void DoMenuUpdates();
     void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
     virtual void OnInternalIdle();
 
     wxMenuBar    *m_frameMenuBar;
     void DoMenuUpdates();
     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;
     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,
 
 protected:
     virtual void DoSetSize(int x, int y,