Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 7579b0b887f78759fb8caa38d5032efd04570bc1..b449ce6ff4d1afaad28b13d5f8bd4b20adfab1b3 100644 (file)
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     25.08.00
 // RCS-ID:      $Id$

-// Copyright:   (c) 2000 Vadim Zeitlin
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univstatbmp.h"
 #endif
 
     #pragma interface "univstatbmp.h"
 #endif
 


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

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

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


@@ -35,7 +35,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0)
     {
                    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,
     }
 
     wxStaticBitmap(wxWindow *parent,


@@ -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);