Applied notebook font patch.

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

diff --git a/include/wx/caret.h b/include/wx/caret.h
index f7d91c76f86fdfa456817629ab320dcf637be124..f8e547bc38fd5102e21309ed8ca99198f0063559 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_CARET
 
 
 #if wxUSE_CARET
 

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

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


@@ -212,18 +212,25 @@ public:
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();
     wxCaretSuspend(wxWindow *win)
     {
         m_caret = win->GetCaret();

-        if ( m_caret )
+        m_show = FALSE;        
+        if ( m_caret && m_caret->IsVisible() )
+        {

             m_caret->Hide();
             m_caret->Hide();

+            m_show = TRUE;
+        }

     }
 
     ~wxCaretSuspend()
     {
     }
 
     ~wxCaretSuspend()
     {

-        if ( m_caret )
+        if ( m_caret && m_show )

             m_caret->Show();
     }
 
 private:
     wxCaret *m_caret;
             m_caret->Show();
     }
 
 private:
     wxCaret *m_caret;

+    bool     m_show;
+
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)

 };
 
 #endif // wxUSE_CARET
 };
 
 #endif // wxUSE_CARET