_MSC_VER => __VISUALC__ change

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 34494a92b5578127d3deccc8bb4ae33fcfe33f7f..0dd712f94631529847e3895586560f76cc2b8713 100644 (file)
--- 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/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"

+#include "wx/icon.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -62,10 +63,13 @@ public:
   virtual void Centre( int direction = wxHORIZONTAL );
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void Centre( int direction = wxHORIZONTAL );
 
   virtual void GetClientSize( int *width, int *height ) const;

+  wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
+  

   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 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* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");


@@ -79,7 +83,7 @@ public:
   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* 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;
+  virtual wxToolBar *GetToolBar() const;

   inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 
   virtual void SetMenuBar( wxMenuBar *menuBar );
   inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
 
   virtual void SetMenuBar( wxMenuBar *menuBar );


@@ -90,15 +94,14 @@ public:
 
   virtual void SetIcon( const wxIcon &icon );
   virtual void Iconize( bool WXUNUSED(iconize)) { }
 
   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 bool IsIconized() const { return FALSE; }
+  bool Iconized() const { return IsIconized(); }

   virtual void Maximize(bool WXUNUSED(maximize)) {}
   virtual void Maximize(bool WXUNUSED(maximize)) {}

-  virtual void Restore(void) {}
+  virtual void Restore() {}

 
   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);

 
   // implementation
   
 
   // implementation
   


@@ -106,12 +109,14 @@ public:
   virtual wxPoint GetClientAreaOrigin() const;
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
   virtual wxPoint GetClientAreaOrigin() const;
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);

+  virtual void OnInternalIdle();

 
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;
   wxString      m_title;
   wxIcon        m_icon;
 
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   wxToolBar    *m_frameToolBar;
   wxString      m_title;
   wxIcon        m_icon;

+  int           m_miniEdge,m_miniTitle;

 
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };