more extra semicolons removed (patch 1303724)

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

diff --git a/include/wx/generic/caret.h b/include/wx/generic/caret.h
index bffe9be1b146fa369e548ed2ebfb60591da607c2..644917c28ae0dccbd0d62c4c5a4f73ec4fcfa07d 100644 (file)
--- a/include/wx/generic/caret.h
+++ b/include/wx/generic/caret.h
@@ -12,13 +12,9 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "caret.h"
-#endif
-

 #include "wx/timer.h"
 
 #include "wx/timer.h"
 

-class wxCaret;
+class WXDLLIMPEXP_CORE wxCaret;

 
 class WXDLLEXPORT wxCaretTimer : public wxTimer
 {
 
 class WXDLLEXPORT wxCaretTimer : public wxTimer
 {


@@ -30,7 +26,7 @@ private:
     wxCaret *m_caret;
 };
 
     wxCaret *m_caret;
 };
 

-class wxCaret : public wxCaretBase
+class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -59,6 +55,7 @@ protected:
     virtual void DoShow();
     virtual void DoHide();
     virtual void DoMove();
     virtual void DoShow();
     virtual void DoHide();
     virtual void DoMove();

+    virtual void DoSize();

 
     // blink the caret once
     void Blink();
 
     // blink the caret once
     void Blink();


@@ -68,7 +65,7 @@ protected:
 
     // draw the caret on the given DC
     void DoDraw(wxDC *dc);
 
     // draw the caret on the given DC
     void DoDraw(wxDC *dc);

-    
+

 private:
     // GTK specific initialization
     void InitGeneric();
 private:
     // GTK specific initialization
     void InitGeneric();


@@ -80,8 +77,8 @@ private:
                   m_yOld;
 
     wxCaretTimer  m_timer;
                   m_yOld;
 
     wxCaretTimer  m_timer;

-    bool          m_blinkedOut,     // TRUE => caret hidden right now
-                  m_hasFocus;       // TRUE => our window has focus
+    bool          m_blinkedOut,     // true => caret hidden right now
+                  m_hasFocus;       // true => our window has focus

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