fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index 5ca47abcf643511403dfdb8e688878edcf52670f..46f9cad23bb709e6fd9fbdd0ec54a886fd43182e 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -27,19 +27,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxGauge;
+class WXDLLIMPEXP_CORE wxGauge;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

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

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

-class wxGauge: public wxControl
+class WXDLLIMPEXP_CORE wxGauge: public wxControl

 {
 public:
     wxGauge() { Init(); }
 {
 public:
     wxGauge() { Init(); }


@@ -77,11 +77,12 @@ public:
 
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
     
 
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
     

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

     // implementation
     // -------------
 
     // implementation
     // -------------
 

-    void ApplyWidgetStyle();
-

     // the max and current gauge values
     int m_rangeMax,
         m_gaugePos;
     // the max and current gauge values
     int m_rangeMax,
         m_gaugePos;


@@ -100,6 +101,8 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

+    virtual wxVisualAttributes GetDefaultAttributes() const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxGauge)
 };