Window management and sizer layout corrections

[wxWidgets.git] / include / wx / os2 / gauge.h

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index cdb6d227f6a65742347151e5afb7c596ea983c28..d7dd800512cfaf1392ef15b504f478a561448f2c 100644 (file)
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -14,64 +14,70 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
-

 class WXDLLEXPORT wxGauge: public wxControl
 {
 class WXDLLEXPORT wxGauge: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxGauge)
- public:
-  inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
+public:
+    inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }

 
 

-  inline wxGauge(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
+    inline wxGauge( wxWindow*          pParent
+                   ,wxWindowID         vId
+                   ,int                nRange
+                   ,const wxPoint&     rPos = wxDefaultPosition
+                   ,const wxSize&      rSize = wxDefaultSize
+                   ,long               lStyle = wxGA_HORIZONTAL
+#if wxUSE_VALIDATORS
+                   ,const wxValidator& rValidator = wxDefaultValidator
+#endif
+                   ,const wxString&    rsName = wxGaugeNameStr
+                  )
+    {
+        Create( pParent
+               ,vId
+               ,nRange
+               ,rPos
+               ,rSize
+               ,lStyle

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+               ,rValidator

 #endif
 #endif

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

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,int                nRange
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = wxGA_HORIZONTAL

 #if wxUSE_VALIDATORS
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
-           const wxValidator& validator = wxDefaultValidator,
-#  endif
+                ,const wxValidator& rValidator = wxDefaultValidator

 #endif
 #endif

-           const wxString& name = wxGaugeNameStr);
+                ,const wxString&    rsName = wxGaugeNameStr
+               );

 
 

-  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  GetRange(void) const;
+    int  GetValue(void) const;

 
 

-  int GetShadowWidth() const ;
-  int GetBezelFace() const ;
-  int GetRange() const ;
-  int GetValue() const ;
+    bool SetBackgroundColour(const wxColour& rColour);
+    void SetBezelFace(int nWidth);
+    bool SetForegroundColour(const wxColour& rColour);
+    void SetRange(int nRange);
+    void SetShadowWidth(int nWidth);
+    void SetValue(int nPos);

 
 

-  bool SetForegroundColour(const wxColour& col);
-  bool SetBackgroundColour(const wxColour& col);
+    inline virtual bool AcceptsFocus(void) const { return FALSE; }
+    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {};

 
 

-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
+protected:
+    int                             m_nRangeMax;
+    int                             m_nGaugePos;

 
 

- protected:
-   int      m_rangeMax;
-   int      m_gaugePos;
-};
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)
+}; // end of CLASS wxGauge
+
+#endif // _WX_GAUGE_H_

 
 

-#endif
-    // _WX_GAUGE_H_