Added wxMenu::Delete() and fixed some menu deleted memory

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

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index 93df894ea67ff945c51c20cbd7db91552b660b83..ffb95c3422b40153cb1d4313fe072e2e7ac74c0d 100644 (file)
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -9,15 +9,27 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if 0 //def __GNUG__
-    #pragma implementation "caret.h"
-#endif
-
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
+#ifdef __GNUG__
+#pragma interface "caret.h"
+#endif
+
 #include "wx/timer.h"
 
+class wxCaret;
+
+class wxCaretTimer : public wxTimer
+{
+public:
+    wxCaretTimer(wxCaret *caret);
+    virtual void Notify();
+
+private:
+    wxCaret *m_caret;
+};
+
 class wxCaret : public wxCaretBase
 {
 public:
@@ -46,23 +58,13 @@ protected:
 
     // draw the caret on the given DC
     void DoDraw(wxDC *dc);
-
+    
 private:
     // GTK specific initialization
     void InitGeneric();
 
-    class CaretTimer : public wxTimer
-    {
-    public:
-        CaretTimer(wxCaret *caret) { m_caret = caret; }
-
-        virtual void Notify() { m_caret->Blink(); }
-
-    private:
-        wxCaret *m_caret;
-    } m_timer;
-
-    bool    m_blinkedOut;   // TRUE => caret hidden right now
+    wxCaretTimer  m_timer;
+    bool          m_blinkedOut;   // TRUE => caret hidden right now
 };
 
 #endif // _WX_CARET_H_