Only define wxIntegerHash::longlongHash when long long isn't long

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

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 60ad9441fa4ee66903de3778948be8467110a137..cf4eb7164c100eafd0617a1af7246525cb061469 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_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatbmp.h"
-#endif
-
 #include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 
-class wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
 public:
     wxStaticBitmap()
@@ -35,7 +31,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 +59,7 @@ public:
 
     wxIcon GetIcon() const;
 
-    virtual bool HasTransparentBackground() { return TRUE; }
+    virtual bool HasTransparentBackground() { return true; }
     
 private:
     virtual void DoDraw(wxControlRenderer *renderer);