Applied patch for ArtProvider.

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index fc17b58df8672ba5e065917ee9de5933bef80603..95de78f9ef9c97e020b51b894e720eb429eef08d 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univstattext.h"
 #endif
 
     #pragma interface "univstattext.h"
 #endif
 


@@ -27,7 +27,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 +55,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