fix unused parameter warnings

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 81595e993974436784baa3ee6a12d79a7e97045a..1c05fbf758a4d770aed46038c6d04005ea23f15e 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -1,68 +1,58 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/msw/stattext.h
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-#ifdef __GNUG__
-    #pragma interface "stattext.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
-DECLARE_DYNAMIC_CLASS(wxStaticText)
-
 public:
     wxStaticText() { }
-    
-    wxStaticText(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr)
+
+    wxStaticText(wxWindow *parent,
+                 wxWindowID id,
+                 const wxString& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxStaticTextNameStr)
     {
         Create(parent, id, label, pos, size, style, name);
     }
-    
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr);
-    
-    // accessors
-    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); }
-    void SetLabel(const wxString& label);
-    
-    // operations
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-    
-    // 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);
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticTextNameStr);
+
+    // override some methods to resize the window properly
+    virtual void SetLabel(const wxString& label);
+    virtual bool SetFont( const wxFont &font );
+
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
+protected:
+    // implement/override some base class virtuals
+    virtual wxBorder GetDefaultBorder() const;
+    virtual void DoSetSize(int x, int y, int w, int h,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize() const;
+
+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };
 
 #endif