Fixes for include guards, patch 1256967 Paul Cornett

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 2de8c76d1050bc6ba5af4fcd78bcc9a420310bd3..1ad12b5e390e06a0c199f99e97989af29bfa0970 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -6,26 +6,24 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 

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

 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:

+    wxStaticText() { }
+

     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {
     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {

-        Create(parent, -1, label, pos, size, 0, wxStaticTextNameStr);
+        Create(parent, wxID_ANY, label, pos, size, 0, wxStaticTextNameStr);

     }
 
     // full form
     }
 
     // full form


@@ -53,6 +51,8 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
 
     virtual void SetLabel(const wxString& label);
 

+    virtual bool IsFocused() const { return false; }
+

 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;
 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;