Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 1a88160d05108c71092b8a995803185536277878..e86f45b59c04a37570a5de5415ad893188a47744 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -4,49 +4,52 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vadim Zeitlin
 // Copyright:   (c) 2000 Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 

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

 #include "wx/defs.h"
 
 #if wxUSE_STATBMP
 
 #include "wx/control.h"
 #include "wx/bitmap.h"
 #include "wx/defs.h"
 
 #if wxUSE_STATBMP
 
 #include "wx/control.h"
 #include "wx/bitmap.h"

+#include "wx/icon.h"

 
 

-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxBitmap;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];

 
 // a control showing an icon or a bitmap
 
 // a control showing an icon or a bitmap

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

 {
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();
 {
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();

-    
+

     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;

+    virtual wxIcon GetIcon() const /* = 0 -- should be pure virtual */
+    {
+        // stub it out here for now as not all ports implement it (but they
+        // should)
+        return wxIcon();
+    }

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    // overridden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }
+    virtual bool HasTransparentBackground() { return true; }

 
 protected:
 
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

-    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -55,10 +58,12 @@ protected:
     #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbmp.h"
     #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbmp.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/statbmp.h"
     #include "wx/gtk/statbmp.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbmp.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/statbmp.h"
+    #include "wx/osx/statbmp.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)