safer definitions for wx(U)Int32,16 (taken from intl.cpp)

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index 63b5476cac4437498805a2a30f1379190bf56282..94b063659ef300c1a7084b9b129a4e07b6660119 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -17,54 +17,68 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/icon.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 {
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 {

-DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+        

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

-
+    

     wxStaticBitmap(wxWindow *parent, wxWindowID id,
     wxStaticBitmap(wxWindow *parent, wxWindowID id,

-            const wxBitmap& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticBitmapNameStr)
+        const wxBitmap& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticBitmapNameStr)

     {
         Create(parent, id, label, pos, size, style, name);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

-
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-            const wxBitmap& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = 0,
-            const wxString& name = wxStaticBitmapNameStr);
-
+        const wxBitmap& label,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = 0,
+        const wxString& name = wxStaticBitmapNameStr);
+    

     virtual void SetBitmap(const wxBitmap& bitmap);
     virtual void SetBitmap(const wxBitmap& bitmap);

-
+    

     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
         return FALSE;
     }
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
         return FALSE;
     }

-
+    

     wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
     wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }

-
+    
+    // for compatibility with wxMSW
+    const wxIcon& GetIcon() const
+    {
+        // don't use wxDynamicCast, icons and bitmaps are really the same thing
+        return (const wxIcon &)m_messageBitmap;
+    }
+    
+    // for compatibility with wxMSW
+    void  SetIcon(const wxIcon& icon)
+    {
+        SetBitmap( icon );
+    }
+    

     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }

-
+    

     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-
+    

 protected:
     wxBitmap m_messageBitmap;
 };
 
 #endif
 protected:
     wxBitmap m_messageBitmap;
 };
 
 #endif

-    // _WX_STATBMP_H_
+// _WX_STATBMP_H_