Revert my last commit, GetClientAreaOrigin was already implemented

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

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index fcfdf802ae0eb3c03993b1025236d3688e1951a4..b449ce6ff4d1afaad28b13d5f8bd4b20adfab1b3 100644 (file)
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univstatbmp.h"
 #endif
 
@@ -22,7 +22,7 @@
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 
-class wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
 public:
     wxStaticBitmap()
@@ -35,7 +35,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0)
     {
-        Create(parent, -1, label, pos, size, style);
+        Create(parent, wxID_ANY, label, pos, size, style);
     }
 
     wxStaticBitmap(wxWindow *parent,
@@ -63,7 +63,7 @@ public:
 
     wxIcon GetIcon() const;
 
-    virtual bool HasTransparentBackground() { return TRUE; }
+    virtual bool HasTransparentBackground() { return true; }
     
 private:
     virtual void DoDraw(wxControlRenderer *renderer);