Added layout constraints call to wxNotebook

[wxWidgets.git] / include / wx / msw / gauge95.h

diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h
index 6de6ab41ad4fc015b355bfb889da22062d47e922..99635c2669aa5e32b3272233c262e9364b4225bb 100644 (file)
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _GAUGE95_H_


@@ -27,29 +27,29 @@ class WXDLLEXPORT wxGauge95: public wxControl
  public:
   inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
 
  public:
   inline wxGauge95(void) { m_rangeMax = 0; m_gaugePos = 0; }
 

-  inline wxGauge95(wxWindow *parent, const wxWindowID id,
-           const int range,
+  inline wxGauge95(wxWindow *parent, wxWindowID id,
+           int range,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxGA_HORIZONTAL,
+           long style = wxGA_HORIZONTAL,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxGaugeNameStr)
   {
     Create(parent, id, range, pos, size, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxGaugeNameStr)
   {
     Create(parent, id, range, pos, size, style, validator, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id,
-           const int range,
+  bool Create(wxWindow *parent, wxWindowID id,
+           int range,

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxGA_HORIZONTAL,
+           long style = wxGA_HORIZONTAL,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxGaugeNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxGaugeNameStr);
 

-  void SetShadowWidth(const int w);
-  void SetBezelFace(const int w);
-  void SetRange(const int r);
-  void SetValue(const int pos);
+  void SetShadowWidth(int w);
+  void SetBezelFace(int w);
+  void SetRange(int r);
+  void SetValue(int pos);

 
   int GetShadowWidth(void) const ;
   int GetBezelFace(void) const ;
 
   int GetShadowWidth(void) const ;
   int GetBezelFace(void) const ;


@@ -64,7 +64,10 @@ class WXDLLEXPORT wxGauge95: public wxControl
   inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
 #endif
 
   inline void SetButtonColour(const wxColour& col) { SetForegroundColour(col); }
 #endif
 

-  void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }

 
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
 
 
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;