Added wxHelpControllerHtml, derived from wxHtmlHelpControllerBase. API like

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 77500f4a5db688d1c183fc18e0f0c754c7df16a2..1718f736641a6f265bb16a015eda03a625441191 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef NO_TEXT_WINDOW_STREAM
 #endif
 
 #ifndef NO_TEXT_WINDOW_STREAM

-    #ifdef wxUSE_STD_IOSTREAM
+    #if wxUSE_STD_IOSTREAM

         #include "ioswrap.h"    // for iostream classes if we need them
     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all
         #include "ioswrap.h"    // for iostream classes if we need them
     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all


@@ -36,6 +36,8 @@
     #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 #endif
 
     #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 #endif
 

+class WXDLLEXPORT wxTextCtrl;
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -100,7 +102,7 @@ public:
     // considering all its contents as a single strings) and (x, y) coordinates
     // which represent column and line.
     virtual long XYToPosition(long x, long y) const = 0;
     // considering all its contents as a single strings) and (x, y) coordinates
     // which represent column and line.
     virtual long XYToPosition(long x, long y) const = 0;

-    virtual void PositionToXY(long pos, long *x, long *y) const = 0;
+    virtual bool PositionToXY(long pos, long *x, long *y) const = 0;

 
     virtual void ShowPosition(long pos) = 0;
 
 
     virtual void ShowPosition(long pos) = 0;