Merged some STC fixes over to the main branch

[wxWidgets.git] / src / os2 / textctrl.cpp

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 1069c438821ef32825729007e4a767a8a933b1e9..3ca7f9177c6ceedd219dc24ce50907d3f2dd7946 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -43,7 +43,6 @@
 #   include <fstream>
 #endif
 
-#if !USE_SHARED_LIBRARY
 
 // ----------------------------------------------------------------------------
 // event tables and other macros
@@ -68,7 +67,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 
-#endif // USE_SHARED_LIBRARY
 
 // ============================================================================
 // implementation
@@ -302,7 +300,8 @@ void wxTextCtrl::Paste()
 bool wxTextCtrl::CanCopy() const
 {
     // Can copy if there's a selection
-    long from, to;
+    long from = 0L;
+    long to = 0L;
 //    GetSelection(& from, & to);
     return (from != to);
 }
@@ -310,7 +309,8 @@ bool wxTextCtrl::CanCopy() const
 bool wxTextCtrl::CanCut() const
 {
     // Can cut if there's a selection
-    long from, to;
+    long from = 0L;
+    long to = 0L;
 //    GetSelection(& from, & to);
     return (from != to);
 }
@@ -527,7 +527,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
     HWND hWnd = GetHwnd();
 
     // This gets the line number containing the character
-    int lineNo;
+    int lineNo = -1;
 //    lineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0);
 
     if ( lineNo == -1 )