Applied notebook font patch.

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

diff --git a/include/wx/msw/caret.h b/include/wx/msw/caret.h
index c42da02842f40175746bb8b98a918304a96a2d22..f1075aa471803e43df2d2cefca04a9a92647b5a6 100644 (file)
--- a/include/wx/msw/caret.h
+++ b/include/wx/msw/caret.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 

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

     #pragma interface "caret.h"
 #endif
 
     #pragma interface "caret.h"
 #endif
 


@@ -31,7 +31,7 @@ public:
         // same as above
     wxCaret(wxWindowBase *window, const wxSize& size)
     {
         // same as above
     wxCaret(wxWindowBase *window, const wxSize& size)
     {

-        wxCaretBase::Init();
+        Init();

 
         (void)Create(window, size);
     }
 
         (void)Create(window, size);
     }


@@ -52,12 +52,15 @@ protected:
     virtual void DoMove();
     virtual void DoShow();
     virtual void DoHide();
     virtual void DoMove();
     virtual void DoShow();
     virtual void DoHide();

+    virtual void DoSize();

 
     // helper function which creates the system caret
     bool MSWCreateCaret();
 
 private:
     bool m_hasCaret;
 
     // helper function which creates the system caret
     bool MSWCreateCaret();
 
 private:
     bool m_hasCaret;

+
+    DECLARE_NO_COPY_CLASS(wxCaret)

 };
 
 #endif // _WX_CARET_H_
 };
 
 #endif // _WX_CARET_H_