wx.aui.AUI_ART_GRADIENT_TYPE --> wx.aui.AUI_DOCKART_GRADIENT_TYPE

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index e0b1d9b9ae2ea93fb2089275b4134736a4d7723f..1ad12b5e390e06a0c199f99e97989af29bfa0970 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -6,16 +6,12 @@
 // 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:     wxWidgets licence
+// Licence:     wxWindows licence

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstattext.h"
-#endif
-

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


@@ -27,7 +23,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {
                  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


@@ -55,9 +51,7 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
 
     virtual void SetLabel(const wxString& label);
 

-    virtual bool HasTransparentBackground() { return TRUE; }
-
-    virtual bool IsFocused() const { return FALSE; }
+    virtual bool IsFocused() const { return false; }

 
 protected:
     // calculate the optimal size for the label
 
 protected:
     // calculate the optimal size for the label