MSVC 5 fix.

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 20c49b73a4f1e1e6db79adcb1d1db9bb78e6fa1b..0ceef4c977a417ba06fc1e6a90e8e7ddb1b1b7b6 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.h
+// Name:        wx/msw/stattext.h

 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:


@@ -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
 


@@ -45,11 +45,14 @@ public:
     virtual bool SetFont( const wxFont &font );
 
 protected:
     virtual bool SetFont( const wxFont &font );
 
 protected:

+    // implement/override some base class virtuals
+    virtual wxBorder GetDefaultBorder() const;

     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;

+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

 
 

-    DECLARE_DYNAMIC_CLASS(wxStaticText)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)

 };
 
 #endif
 };
 
 #endif