* wxMemory*Stream link problem fix.

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index d66db9614b2dbcdbf31b72ebc0a82b5b7579359e..3a5fd03e743dea17ee8d464386999953b024b6cf 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -26,21 +26,21 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
  public:
   inline wxStaticBitmap(void) { }
 
  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 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);
   }
 
            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 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);
            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)) {};
 
   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; }
 
 
   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);
   // Implementation
   virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);