Changed floats to doubles in wxexpr.h; added a flag in accel.h (wxACCEL_NONE for

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index d66db9614b2dbcdbf31b72ebc0a82b5b7579359e..b6aca08bb1496af6f16878f73c2d1bd361991d0b 100644 (file)
--- 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,13 @@ 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);
 
   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 +64,4 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 };
 
 #endif
-    // __STATBMPH__
+    // _WX_STATBMP_H_