fixed warnings after GetFont prototype change

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

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 940827f806dad40958053ace76eefe57d54cd7b7..0a69f1e236bf5def1aeacc176bbcb6d44db8b498 100644 (file)
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -12,8 +12,8 @@
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 

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

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


@@ -22,7 +22,7 @@
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 

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

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


@@ -63,6 +63,8 @@ public:
 
     wxIcon GetIcon() const;
 
 
     wxIcon GetIcon() const;
 

+    virtual bool HasTransparentBackground() { return TRUE; }
+    

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