Escape underscores

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

diff --git a/include/wx/os2/stattext.h b/include/wx/os2/stattext.h
index b410f9787bf64d43c3a7ff4345b217ef2a6435f0..13997365374b85273f873a2c1b8a8b85aef36859 100644 (file)
--- a/include/wx/os2/stattext.h
+++ b/include/wx/os2/stattext.h
@@ -12,52 +12,64 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#ifdef __GNUG__
-#pragma interface "stattext.h"
-#endif
-

 #include "wx/control.h"
 
 #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:
+public:

     inline wxStaticText() { }
     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)
+    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(parent, id, label, pos, size, style, name);
+        Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName);

     }
 
     }
 

-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticTextNameStr);
+    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&);
+    //
+    // Accessors
+    //
+    virtual void SetLabel(const wxString& rsLabel);
+    virtual bool SetFont(const wxFont &rFont);

 
 

-    // overriden base class virtuals
+    //
+    // Overriden base class virtuals
+    //

     virtual bool AcceptsFocus() const { return FALSE; }
 
     virtual bool AcceptsFocus() const { return FALSE; }
 

-    // callbacks
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    //
+    // Callbacks
+    //
+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );

 
 protected:
 
 protected:

-    virtual wxSize DoGetBestSize() const;
-};
+    virtual void   DoSetSize( int nX
+                             ,int nY
+                             ,int nWidth
+                             ,int nHeight
+                             ,int nSizeFlags = wxSIZE_AUTO
+                            );
+    virtual wxSize DoGetBestSize(void) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticText)
+}; // end of CLASS wxStaticText

 
 #endif
     // _WX_STATTEXT_H_
 
 #endif
     // _WX_STATTEXT_H_