Implement basic support for virtual file systems for the ie backend. Registering...

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

diff --git a/include/wx/palmos/statbmp.h b/include/wx/palmos/statbmp.h
index 0e130aeec989f8e00bfc1435ed33beee6f70e8eb..35113094234c82a0d4745a050e7b756342447351 100644 (file)
--- a/include/wx/palmos/statbmp.h
+++ b/include/wx/palmos/statbmp.h
@@ -12,18 +12,14 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

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

 #include "wx/control.h"
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
 #include "wx/control.h"
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStaticBitmapNameStr[];

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

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

 {
 public:
     wxStaticBitmap() { Init(); }
 {
 public:
     wxStaticBitmap() { Init(); }


@@ -58,14 +54,14 @@ public:
     // vice versa
     wxIcon GetIcon() const
     {
     // vice versa
     wxIcon GetIcon() const
     {

-        wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") );
+        wxASSERT_MSG( m_isIcon, wxT("no icon in this wxStaticBitmap") );

 
         return *(wxIcon *)m_image;
     }
 
     wxBitmap GetBitmap() const
     {
 
         return *(wxIcon *)m_image;
     }
 
     wxBitmap GetBitmap() const
     {

-        wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
+        wxASSERT_MSG( !m_isIcon, wxT("no bitmap in this wxStaticBitmap") );

 
         return *(wxBitmap *)m_image;
     }
 
         return *(wxBitmap *)m_image;
     }


@@ -97,7 +93,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);

 };
 
 #endif
 };
 
 #endif