All variables/parameters having to do with number of columns changed to be of type...

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

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index c9d836f4ea81bfa8f922d979a9d5af0204ec0202..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
@@ -88,11 +86,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxSize& size,
                         long style,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                        const wxValidator* validator,
-#  else
                         const wxValidator& validator,
-#  endif
 #endif
                         const wxString& name)
 {
@@ -306,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);
 }
@@ -314,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);
 }
@@ -531,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 )
@@ -802,10 +798,10 @@ bool wxTextCtrl::AcceptsFocus() const
     return IsEditable() && wxControl::AcceptsFocus();
 }
 
-wxSize wxTextCtrl::DoGetBestSize()
+wxSize wxTextCtrl::DoGetBestSize() const
 {
     int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());
 
     int wText = DEFAULT_ITEM_WIDTH;