apply complete transforms (scroll window PrepareDC was not functioning properly)

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 0eb6adee67986a5fed4465c103edd42a58f5874f..61dd3fa1f6884389684014c88c3fe85f68be55c3 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -28,11 +28,20 @@
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
 
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
 

-// obsolete style
-#define wxGA_PROGRESSBAR     0
-
+#if WXWIN_COMPATIBILITY_2_6
+    // obsolete style
+    #define wxGA_PROGRESSBAR     0
+#endif // WXWIN_COMPATIBILITY_2_6
+
+// GTK and Mac always have native implementation of the indeterminate mode
+// wxMSW has native implementation only if comctl32.dll >= 6.00
+#if !defined(__WXGTK20__) && !defined(__WXMAC__) && !defined(__WXCOCOA__)
+    #define wxGAUGE_EMULATE_INDETERMINATE_MODE 1
+#else
+    #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
+#endif

 
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar


@@ -53,18 +62,21 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxGaugeNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxGaugeNameStr);
 

+    // determinate mode API
+

     // set/get the control range
     virtual void SetRange(int range);
     virtual int GetRange() const;
 
     // set/get the control range
     virtual void SetRange(int range);
     virtual int GetRange() const;
 

-    // position

     virtual void SetValue(int pos);
     virtual int GetValue() const;
 
     virtual void SetValue(int pos);
     virtual int GetValue() const;
 

+    // indeterminate mode API
+    virtual void Pulse();
+

     // simple accessors
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
 
     // simple accessors
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
 

-

     // appearance params (not implemented for most ports)
     virtual void SetShadowWidth(int w);
     virtual int GetShadowWidth() const;
     // appearance params (not implemented for most ports)
     virtual void SetShadowWidth(int w);
     virtual int GetShadowWidth() const;


@@ -82,6 +94,10 @@ protected:
     // the current position
     int m_gaugePos;
 
     // the current position
     int m_gaugePos;
 

+#if wxGAUGE_EMULATE_INDETERMINATE_MODE
+    int m_nDirection;       // can be wxRIGHT or wxLEFT
+#endif
+

     DECLARE_NO_COPY_CLASS(wxGaugeBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxGaugeBase)
 };
 


@@ -92,8 +108,10 @@ protected:
     #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
     #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/gauge.h"
     #include "wx/gtk/gauge.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/gauge.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXCOCOA__)