"wxGDIObject * => &" related changes (see mail to the list)

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index af0fe7328accc8570bb0ae626936c2672e27162a..3c235d2171a861540bd3deea2e016ae981c7e3e9 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -59,12 +59,15 @@ public:
   bool Destroy();
 
   virtual bool Show( bool show );
   bool Destroy();
 
   virtual bool Show( bool show );

-  virtual void Enable( bool enable );

   virtual void Centre( int direction = wxHORIZONTAL );
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 
   virtual void Centre( int direction = wxHORIZONTAL );
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 

+  virtual void SetSize( int x, int y, int width, int height,
+    int sizeFlags = wxSIZE_AUTO );
+  virtual void SetSize( int width, int 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,
   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,


@@ -96,32 +99,21 @@ public:
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
   void OnCloseWindow( wxCloseEvent& event );
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
   void OnCloseWindow( wxCloseEvent& event );

-  void OnIdle(wxIdleEvent& event);
+  void OnIdle(wxIdleEvent& event );

 
 

-  void AddChild( wxWindow *child );
-  

   // implementation
   
   virtual void GtkOnSize( int x, int y, int width, int height );
   // implementation
   
   virtual void GtkOnSize( int x, int y, int width, int height );

-
-private:
-  friend  wxWindow;
-  friend  wxMDIChildFrame;
-  friend  wxMDIClientWindow;
-
-  // update frame's menus (called from OnIdle)
+  virtual wxPoint GetClientAreaOrigin() const;

   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);

-  virtual void ImplementSetPosition();

 
 

-  GtkWidget    *m_mainWindow;

   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;

-  int           m_toolBarHeight;
-  bool          m_addPrivateChild;   // for toolbar (and maybe menubar)

   wxString      m_title;
   wxIcon        m_icon;
   wxString      m_title;
   wxIcon        m_icon;

+  int           m_miniEdge,m_miniTitle;

 
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };