Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index e75a0c41b5f0deb3942f365ac0c08d06a81b2e64..c1d22c1a988e8b9da3e3b0b0ceca3fca0733744c 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -11,11 +11,14 @@
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 
 #ifndef __GTKGAUGEH__
 #define __GTKGAUGEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #include "wx/defs.h"
 #pragma interface
 #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"


@@ -30,7 +33,7 @@ class wxGauge;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char* wxGaugeNameStr;
+extern const wxChar* wxGaugeNameStr;

 
 //-----------------------------------------------------------------------------
 // wxGaugeBox
 
 //-----------------------------------------------------------------------------
 // wxGaugeBox


@@ -38,28 +41,33 @@ extern const char* wxGaugeNameStr;
 
 class wxGauge: public wxControl
 {
 
 class wxGauge: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxGauge)
-  
-  public:
-    inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
-
-    inline wxGauge( wxWindow *parent, wxWindowID id, int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr )
+public:
+    wxGauge() { Init(); }
+
+    wxGauge( wxWindow *parent,
+             wxWindowID id,
+             int range,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxGA_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxGaugeNameStr )

     {
     {

-      Create(parent, id, range, pos, size, style, validator, name);
+        Init();
+
+        Create(parent, id, range, pos, size, style, validator, name);

     }
     }

-    bool Create( wxWindow *parent, wxWindowID id, int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr );
-    void SetShadowWidth( int WXUNUSED(w) ) {};
-    void SetBezelFace( int WXUNUSED(w) ) {};
+
+    bool Create( wxWindow *parent,
+                 wxWindowID id, int range,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxGA_HORIZONTAL,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxGaugeNameStr );
+
+    void SetShadowWidth( int WXUNUSED(w) ) { }
+    void SetBezelFace( int WXUNUSED(w) ) { }

     void SetRange( int r );
     void SetValue( int pos );
     int GetShadowWidth() const { return 0; };
     void SetRange( int r );
     void SetValue( int pos );
     int GetShadowWidth() const { return 0; };


@@ -67,16 +75,31 @@ class wxGauge: public wxControl
     int GetRange() const;
     int GetValue() const;
 
     int GetRange() const;
     int GetValue() const;
 

-    // Are we a Win95/GTK progress bar, or a normal gauge?
-    inline bool GetProgressBar() const { return m_useProgressBar; }
-    
-  // implementation
-    
+    // implementation
+    // -------------
+

     void ApplyWidgetStyle();
     void ApplyWidgetStyle();

-  
-   int      m_rangeMax;
-   int      m_gaugePos;
-   bool     m_useProgressBar;
+
+    // the max and current gauge values
+    int m_rangeMax,
+        m_gaugePos;
+
+    // obsolete functions, don't use
+#ifdef WXWIN_COMPATIBILITY_2_2
+    bool GetProgressBar() const { return TRUE; }
+#endif // WXWIN_COMPATIBILITY_2_2
+
+protected:
+    // common part of all ctors
+    void Init() { m_rangeMax = m_gaugePos = 0; }
+
+    // set the gauge value to the value of m_gaugePos
+    void DoSetGauge();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGauge)

 };
 
 };
 

+#endif
+

 #endif // __GTKGAUGEH__
 #endif // __GTKGAUGEH__