Reworked the undef stuff a little

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 490d00170f6ac8f88c0b2784cd4cabf29f30eaa5..aa968fe8673da228b12d47112039529f3faa052e 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


@@ -49,7 +49,7 @@ class wxFrame: public wxWindow
 DECLARE_DYNAMIC_CLASS(wxFrame)
 
 public:
 DECLARE_DYNAMIC_CLASS(wxFrame)
 
 public:

-    wxFrame();
+    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 );
     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 );


@@ -62,10 +62,8 @@ public:
     virtual bool Show( bool show );
     virtual void Centre( int direction = wxHORIZONTAL );
 
     virtual bool Show( bool show );
     virtual void Centre( int direction = wxHORIZONTAL );
 

-    virtual void GetClientSize( int *width, int *height ) const;
-

     virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     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;


@@ -85,6 +83,9 @@ public:
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     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 );
     virtual void Iconize( bool WXUNUSED(iconize)) { }
     virtual bool IsIconized() const { return FALSE; }
     virtual void SetIcon( const wxIcon &icon );
     virtual void Iconize( bool WXUNUSED(iconize)) { }
     virtual bool IsIconized() const { return FALSE; }


@@ -103,25 +104,31 @@ 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;
+    bool          m_insertInClientArea;  /* not from within OnCreateXXX */

 
 protected:
 
 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 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()
 
 private:
     DECLARE_EVENT_TABLE()