update from James Bishop

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 764a0fe7e3ae02c402b2322ef0dfdd74f0f90244..e0e4566370a49248554c847975c496014cb55fee 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -1,21 +1,71 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/statbmp.h
+// Purpose:     wxStaticBitmap class interface
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     25.08.00
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 Vadim Zeitlin
+// 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(__WXMSW__)
-#include "wx/msw/statbmp.h"
+#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"
+
+class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxBitmap;
+
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
+
+// a control showing an icon or a bitmap
+class WXDLLEXPORT wxStaticBitmapBase : public wxControl
+{
+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;
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
+};
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/statbmp.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/statbmp.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/statbmp.h"
+    #include "wx/motif/statbmp.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/statbmp.h"
-#elif defined(__WXQT__)
-#include "wx/qt/statbmp.h"
+    #include "wx/gtk/statbmp.h"

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

-#include "wx/mac/statbmp.h"
+    #include "wx/mac/statbmp.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statbmp.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/statbmp.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/statbmp.h"
+    #include "wx/os2/statbmp.h"

 #endif
 
 #endif
 

+#endif // wxUSE_STATBMP
+

 #endif
     // _WX_STATBMP_H_BASE_
 #endif
     // _WX_STATBMP_H_BASE_