Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 9b2340de44217abdbcf7a4d312a0de1be5c28609..21effecb5857d9ea8adf59c548a12357bbcdad56 100644 (file)
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "caret.h"
 #endif
 
@@ -20,7 +20,7 @@
 
 class wxCaret;
 
-class wxCaretTimer : public wxTimer
+class WXDLLEXPORT wxCaretTimer : public wxTimer
 {
 public:
     wxCaretTimer(wxCaret *caret);
@@ -73,6 +73,12 @@ private:
     // GTK specific initialization
     void InitGeneric();
 
+    // the bitmap holding the part of window hidden by the caret when it was
+    // at (m_xOld, m_yOld)
+    wxBitmap      m_bmpUnderCaret;
+    int           m_xOld,
+                  m_yOld;
+
     wxCaretTimer  m_timer;
     bool          m_blinkedOut,     // TRUE => caret hidden right now
                   m_hasFocus;       // TRUE => our window has focus