Add wxLOCALE_DONT_LOAD_DEFAULT (=0) for clarity.

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

diff --git a/include/wx/palmos/statbmp.h b/include/wx/palmos/statbmp.h
index 93b4dc2cb2223fd96b97b9371392e1dbdd7d194e..35113094234c82a0d4745a050e7b756342447351 100644 (file)
--- a/include/wx/palmos/statbmp.h
+++ b/include/wx/palmos/statbmp.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/statbmp.h
 // Purpose:     wxStaticBitmap class for Palm OS
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,18 +12,14 @@
 #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"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
 public:
     wxStaticBitmap() { Init(); }
@@ -58,14 +54,14 @@ public:
     // 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
     {
-        wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
+        wxASSERT_MSG( !m_isIcon, wxT("no bitmap in this wxStaticBitmap") );
 
         return *(wxBitmap *)m_image;
     }
@@ -97,7 +93,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
 };
 
 #endif