bugfixes, bugfixes, bugfixes...

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

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index aa8eaf229eb9731065a8474cffd145c543ad046e..56fe3b63d82cd43786b1cca9563efc2068896900 100644 (file)
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h
 // Purpose:     wxStaticText class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h
 // Purpose:     wxStaticText class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/17/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_


@@ -20,37 +20,56 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
 
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
 

-class WXDLLEXPORT wxStaticText: public wxControl
+class WXDLLEXPORT wxStaticText : public wxControl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticText)
+ DECLARE_DYNAMIC_CLASS(wxStaticText)
+

  public:
  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)) {};
-};
+    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
+    //
+    void SetLabel(const wxString&);
+    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 wxSize DoGetBestSize(void) const;
+}; // end of CLASS wxStaticText

 
 #endif
     // _WX_STATTEXT_H_
 
 #endif
     // _WX_STATTEXT_H_