Added a few files; fixed some warnings and wxMotif compile problems

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

diff --git a/include/wx/motif/statbmp.h b/include/wx/motif/statbmp.h
index 8045813fc44c594a2da7df0959e4589928db9214..3da85fba6f84d9e9a94042736cf0a22e015e57fe 100644 (file)
--- a/include/wx/motif/statbmp.h
+++ b/include/wx/motif/statbmp.h
@@ -25,6 +25,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
   DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
  public:
   inline wxStaticBitmap() { }
   DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
  public:
   inline wxStaticBitmap() { }

+  ~wxStaticBitmap();

 
   inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
            const wxBitmap& label,
 
   inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
            const wxBitmap& label,


@@ -49,12 +50,21 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

+  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
+    { wxWindow::SetSize(rect, sizeFlags); }
+  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+  virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }

 
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
 
 
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_messageBitmap; }
 
   // overriden base class virtuals
   virtual bool AcceptsFocus() const { return FALSE; }
 

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

  protected:
   wxBitmap m_messageBitmap;
 
  protected:
   wxBitmap m_messageBitmap;