fixed wxImage->wxBitmap conversion for images with alpha channel

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

diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index 29c00938e91aee9e7db34c12ff81ce80bba5120d..e1c270508b4a3395e63d51b8b179971d226b6037 100644 (file)
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     23.05.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "caret.h"
 #endif
 
@@ -59,6 +59,8 @@ protected:
 
 private:
     bool m_hasCaret;
+
+    DECLARE_NO_COPY_CLASS(wxCaret)
 };
 
 #endif // _WX_CARET_H_