support for using DIBs for wxBitmap implementation (patch 649866)

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index b468392fac0eb63b7fde66a2b37e560e5c749ba9..3e69e5bd406f225df53e9dbd19784e9b2adb3e7d 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -12,8 +12,8 @@
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 

-#ifdef __GNUG__
-    #pragma implementation "gaugebase.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "gaugebase.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -31,9 +31,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:

-#ifdef __DARWIN__
-    virtual ~wxGaugeBase() { }
-#endif
+    virtual ~wxGaugeBase();
+

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


@@ -86,8 +85,6 @@ protected:
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/gauge.h"

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