Replace wxT() with wxS() in image options definitions.

[wxWidgets.git] / include / wx / univ / statbmp.h

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index b449ce6ff4d1afaad28b13d5f8bd4b20adfab1b3..2c9e011547fa92366c7172696d4490d32f0fdf0a 100644 (file)
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -12,17 +12,13 @@
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatbmp.h"
-#endif
-

 #include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 
 #include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase

 {
 public:
     wxStaticBitmap()
 {
 public:
     wxStaticBitmap()


@@ -64,10 +60,11 @@ public:
     wxIcon GetIcon() const;
 
     virtual bool HasTransparentBackground() { return true; }
     wxIcon GetIcon() const;
 
     virtual bool HasTransparentBackground() { return true; }

-    
-private:
+
+protected:

     virtual void DoDraw(wxControlRenderer *renderer);
 
     virtual void DoDraw(wxControlRenderer *renderer);
 

+private:

     // the bitmap which we show
     wxBitmap m_bitmap;
 
     // the bitmap which we show
     wxBitmap m_bitmap;