MSW Caret is now destroyed and recreated when resized.

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

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 82022466ef52497a47301cf2e9ad75ef14ca2965..3ca7f9177c6ceedd219dc24ce50907d3f2dd7946 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -43,7 +43,6 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

-#if !USE_SHARED_LIBRARY

 
 // ----------------------------------------------------------------------------
 // event tables and other macros
 
 // ----------------------------------------------------------------------------
 // event tables and other macros


@@ -68,7 +67,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 

-#endif // USE_SHARED_LIBRARY

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -87,7 +85,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos,
                         const wxSize& size,
                         long style,
                         const wxPoint& pos,
                         const wxSize& size,
                         long style,

+#if wxUSE_VALIDATORS

                         const wxValidator& validator,
                         const wxValidator& validator,

+#endif

                         const wxString& name)
 {
     // base initialization
                         const wxString& name)
 {
     // base initialization


@@ -300,7 +300,8 @@ void wxTextCtrl::Paste()
 bool wxTextCtrl::CanCopy() const
 {
     // Can copy if there's a selection
 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);
 }
 //    GetSelection(& from, & to);
     return (from != to);
 }


@@ -308,7 +309,8 @@ bool wxTextCtrl::CanCopy() const
 bool wxTextCtrl::CanCut() const
 {
     // Can cut if there's a selection
 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);
 }
 //    GetSelection(& from, & to);
     return (from != to);
 }


@@ -525,7 +527,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
     HWND hWnd = GetHwnd();
 
     // This gets the line number containing the character
     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 )
 //    lineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0);
 
     if ( lineNo == -1 )


@@ -796,10 +798,10 @@ bool wxTextCtrl::AcceptsFocus() const
     return IsEditable() && wxControl::AcceptsFocus();
 }
 
     return IsEditable() && wxControl::AcceptsFocus();
 }
 

-wxSize wxTextCtrl::DoGetBestSize()
+wxSize wxTextCtrl::DoGetBestSize() const

 {
     int cx, cy;
 {
     int cx, cy;

-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());

 
     int wText = DEFAULT_ITEM_WIDTH;
 
 
     int wText = DEFAULT_ITEM_WIDTH;