Fixed Windows DLL link problems with wxHtmlProcessor

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 51e9563b56d9d8c39edda0add93a520300a4ba86..ee018c01a17be90db5e34217160dba695477a002 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -2,9 +2,8 @@
 // Name:        gauge.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        gauge.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_GAUGE
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -39,13 +41,10 @@ extern const char* wxGaugeNameStr;
 
 class wxGauge: public wxControl
 {
 
 class wxGauge: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
-    inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
+public:
+    inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }

 
 

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

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,


@@ -54,8 +53,7 @@ class wxGauge: public wxControl
     {
       Create(parent, id, range, pos, size, style, validator, name);
     }
     {
       Create(parent, id, range, pos, size, style, validator, name);
     }

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

            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxGA_HORIZONTAL,


@@ -65,19 +63,26 @@ class wxGauge: public wxControl
     void SetBezelFace( int WXUNUSED(w) ) {};
     void SetRange( int r );
     void SetValue( int pos );
     void SetBezelFace( int WXUNUSED(w) ) {};
     void SetRange( int r );
     void SetValue( int pos );

-    int GetShadowWidth(void) const { return 0; };
-    int GetBezelFace(void) const { return 0; };
-    int GetRange(void) const;
-    int GetValue(void) const;
+    int GetShadowWidth() const { return 0; };
+    int GetBezelFace() const { return 0; };
+    int GetRange() const;
+    int GetValue() const;

 
     // Are we a Win95/GTK progress bar, or a normal gauge?
 
     // Are we a Win95/GTK progress bar, or a normal gauge?

-    inline bool GetProgressBar(void) const { return m_useProgressBar; }
-
- protected:
- 
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+    inline bool GetProgressBar() const { return m_useProgressBar; }
+    
+    // implementation
+    // -------------
+    
+    void ApplyWidgetStyle();
+    int      m_rangeMax;
+    int      m_gaugePos;
+    bool     m_useProgressBar;
+   
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)

 };
 
 };
 

+#endif
+

 #endif // __GTKGAUGEH__
 #endif // __GTKGAUGEH__