X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..452418c4b0763eb611432e84f077c9766e282057:/include/wx/os2/stattext.h

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index 0cc438e9b6..1399736537 100644
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -1,58 +1,75 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h
 // Purpose:     wxStaticText class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/17/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) David Webster
+// 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:
-  inline wxStaticText() { }
-
-  inline 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 SetLabel(const wxString&);
-
-  // operations
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+public:
+    inline wxStaticText() { }
+    inline wxStaticText( wxWindow*       pParent
+                        ,wxWindowID      vId
+                        ,const wxString& rsLabel
+                        ,const wxPoint&  rPos = wxDefaultPosition
+                        ,const wxSize&   rSize = wxDefaultSize
+                        ,long            lStyle = 0L
+                        ,const wxString& rsName = wxStaticTextNameStr
+                       )
+    {
+        Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName);
+    }
+
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxString& rsLabel
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = 0L
+                ,const wxString& rsName = wxStaticTextNameStr
+               );
+
+    //
+    // Accessors
+    //
+    virtual void SetLabel(const wxString& rsLabel);
+    virtual bool SetFont(const wxFont &rFont);
+
+    //
+    // Overriden base class virtuals
+    //
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+    //
+    // Callbacks
+    //
+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+
+protected:
+    virtual void   DoSetSize( int nX
+                             ,int nY
+                             ,int nWidth
+                             ,int nHeight
+                             ,int nSizeFlags = wxSIZE_AUTO
+                            );
+    virtual wxSize DoGetBestSize(void) const;
+
 private:
-  void SetSize(int width, int height) {wxWindow::SetSize(width, height);}
-};
+    DECLARE_DYNAMIC_CLASS(wxStaticText)
+}; // end of CLASS wxStaticText
 
 #endif
     // _WX_STATTEXT_H_