Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 80d3f50a54cdd80389f18aabb670a2ff174e36f4..6f6016f11c225b4e03457b2fcda7847ff8b9b633 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

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

     #pragma interface "stattext.h"
 #endif
 
     #pragma interface "stattext.h"
 #endif
 


@@ -51,6 +51,7 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

+    virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg);

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };