X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..7b218dfaf47dc47705f6d6cba9408fa9f9cca70e:/include/wx/msw/statbmp.h

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index d66db9614b..e4b0253978 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __STATBMPH__
-#define __STATBMPH__
+#ifndef _WX_STATBMP_H_
+#define _WX_STATBMP_H_
 
 #ifdef __GNUG__
 #pragma interface "statbmp.h"
@@ -26,21 +26,21 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
  public:
   inline wxStaticBitmap(void) { }
 
-  inline wxStaticBitmap(wxWindow *parent, const wxWindowID id,
+  inline wxStaticBitmap(wxWindow *parent, wxWindowID id,
            const wxBitmap& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           const long style = 0,
+           long style = 0,
            const wxString& name = wxStaticBitmapNameStr)
   {
     Create(parent, id, label, pos, size, style, name);
   }
 
-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,
            const wxBitmap& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           const long style = 0,
+           long style = 0,
            const wxString& name = wxStaticBitmapNameStr);
 
   virtual void SetBitmap(const wxBitmap& bitmap);
@@ -48,10 +48,16 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
-  void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
+  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); }
 
   inline wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
 
+  // overriden base class virtuals
+  virtual bool AcceptsFocus() const { return FALSE; }
+
   // Implementation
   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
@@ -61,4 +67,4 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 };
 
 #endif
-    // __STATBMPH__
+    // _WX_STATBMP_H_