* wxMemory*Stream link problem fix.

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 4f6e66aa4eb0b997e3861210b0de116fe188d8d5..8dd0bcb76f5779a360b102f4b8154b711648676c 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -26,33 +26,37 @@ class WXDLLEXPORT wxStaticText: public wxControl
  public:
   inline wxStaticText(void) { }
 
  public:
   inline wxStaticText(void) { }
 

-  inline wxStaticText(wxWindow *parent, const wxWindowID id,
+  inline wxStaticText(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = 0,
+           long style = 0,

            const wxString& name = wxStaticTextNameStr)
   {
     Create(parent, id, label, pos, size, style, name);
   }
 
            const wxString& name = wxStaticTextNameStr)
   {
     Create(parent, id, label, pos, size, style, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = 0,
+           long style = 0,

            const wxString& name = wxStaticTextNameStr);
 
            const wxString& name = wxStaticTextNameStr);
 

+  // accessors
+  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+  void SetLabel(const wxString&);
+
+  // operations

   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 SetLabel(const wxString&);
-
-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+  // overriden base class virtuals
+  virtual bool AcceptsFocus() const { return FALSE; }

 
 

+  // callbacks
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                                               WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 };
 
   virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 };