Compilation fix for OS/2.

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 5701847e563befc3bbf66d2110b86eda4f6808de..a944b5d8baf01d29710b815685d7275e57c58aaf 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -46,6 +46,10 @@
     #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 #endif
 
     #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 #endif
 

+#if defined(__WXMSW__) && defined(__MINGW32__)
+    #include "wx/msw/winundef.h"
+#endif
+

 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTextCtrlBase;
 
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxTextCtrlBase;
 


@@ -66,6 +70,11 @@ typedef long wxTextCoord;
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
 

+// this is intentionally not enum to avoid warning fixes with
+// typecasting from enum type to wxTextCoord
+const wxTextCoord wxOutOfRangeTextCoord = -1;
+const wxTextCoord wxInvalidTextCoord    = -2;
+

 // ----------------------------------------------------------------------------
 // wxTextCtrl style flags
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextCtrl style flags
 // ----------------------------------------------------------------------------


@@ -355,7 +364,7 @@ public:
     virtual void SetInsertionPoint(long pos) = 0;
     virtual void SetInsertionPointEnd() = 0;
     virtual long GetInsertionPoint() const = 0;
     virtual void SetInsertionPoint(long pos) = 0;
     virtual void SetInsertionPointEnd() = 0;
     virtual long GetInsertionPoint() const = 0;

-    virtual long GetLastPosition() const = 0;
+    virtual wxTextPos GetLastPosition() const = 0;

 
     virtual void SetSelection(long from, long to) = 0;
     virtual void SelectAll();
 
     virtual void SetSelection(long from, long to) = 0;
     virtual void SelectAll();