1. wxTimer change - now generates EVT_TIMER()

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 00675d4c95e08ac141d67300ed7a654bb0888f5f..732a38ebe88f69112483c6c32f83be16a72e543a 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -16,13 +16,6 @@
     #pragma interface "textctrl.h"
 #endif
 
     #pragma interface "textctrl.h"
 #endif
 

-// can we use RICHEDIT class for wxTextCtrl implementation?
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__)
-    #define wxUSE_RICHEDIT 1
-#else
-    #define wxUSE_RICHEDIT 0
-#endif
-

 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:


@@ -128,10 +121,6 @@ public:
     void SetRichEdit(bool isRich) { m_isRich = isRich; }
 #endif // wxUSE_RICHEDIT
 
     void SetRichEdit(bool isRich) { m_isRich = isRich; }
 #endif // wxUSE_RICHEDIT
 

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam,
-                                WXLPARAM lParam);
-

     virtual void AdoptAttributesFromHWND();
     virtual void SetupColours();
 
     virtual void AdoptAttributesFromHWND();
     virtual void SetupColours();
 


@@ -162,7 +151,7 @@ protected:
     // limit is big enough)
     void AdjustSpaceLimit();
 
     // limit is big enough)
     void AdjustSpaceLimit();
 

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()