wxOS2 build fixes after wxColourBase introduction.

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 3c882c69c320973bc455ebc6ebfe6e39268cd2ec..1ad12b5e390e06a0c199f99e97989af29bfa0970 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -12,10 +12,6 @@
 #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