clipping to client area

[wxWidgets.git] / src / msw / combobox.cpp

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 94ded90fd17c32bbfdfb91eb0cd3814421c742e5..0bd353a41a2f97b46c25dda003092f66e326b33b 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -476,6 +476,29 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
     return msStyle;
 }
 

+// ----------------------------------------------------------------------------
+// wxComboBox geometry
+// ----------------------------------------------------------------------------
+
+void
+wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    // work around a Windows bug (search for "Bug in Windows Combobox" in
+    // Google Groups): resizing the combobox changes the selection in it
+    long fromOld, toOld;
+    GetSelection(&fromOld, &toOld);
+
+    wxChoice::DoSetSize(x, y, width, height, sizeFlags);
+
+    long fromNew, toNew;
+    GetSelection(&fromNew, &toNew);
+
+    if ( fromOld != fromNew || toOld != toNew )
+    {
+        SetSelection(fromOld, toOld);
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------


@@ -535,6 +558,9 @@ void wxComboBox::SelectAll()
 
 bool wxComboBox::CanUndo() const
 {
 
 bool wxComboBox::CanUndo() const
 {

+    if (!IsEditable())
+        return false;
+    

     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;


@@ -544,6 +570,9 @@ bool wxComboBox::CanUndo() const
 
 bool wxComboBox::CanRedo() const
 {
 
 bool wxComboBox::CanRedo() const
 {

+    if (!IsEditable())
+        return false;
+    

     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;


@@ -566,7 +595,7 @@ bool wxComboBox::CanCopy() const
 
 bool wxComboBox::CanCut() const
 {
 
 bool wxComboBox::CanCut() const
 {

-    return CanCopy() && IsEditable();
+    return IsEditable() && CanCopy() ;

 }
 
 bool wxComboBox::CanPaste() const
 }
 
 bool wxComboBox::CanPaste() const


@@ -620,30 +649,29 @@ void wxComboBox::SetInsertionPointEnd()
     // setting insertion point doesn't make sense for read only comboboxes
     if ( !(GetWindowStyle() & wxCB_READONLY) )
     {
     // setting insertion point doesn't make sense for read only comboboxes
     if ( !(GetWindowStyle() & wxCB_READONLY) )
     {

-        long pos = GetLastPosition();
+        wxTextPos pos = GetLastPosition();

         SetInsertionPoint(pos);
     }
 }
 
 long wxComboBox::GetInsertionPoint() const
 {
         SetInsertionPoint(pos);
     }
 }
 
 long wxComboBox::GetInsertionPoint() const
 {

-#ifdef __WIN32__
-    DWORD Pos=(DWORD)SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
-    return Pos&0xFFFF;
-#else
-    return 0;
-#endif
+    // CB_GETEDITSEL returns the index of the last character after selection in
+    // its high-order word
+    DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
+
+    return HIWORD(pos);

 }
 
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     HWND hEditWnd = (HWND) GetEditHWND();
 
     // Get number of characters in the last (only) line. We'll add this to the character
     // index for the last line, 1st position.
 {
     HWND hEditWnd = (HWND) GetEditHWND();
 
     // Get number of characters in the last (only) line. We'll add this to the character
     // index for the last line, 1st position.

-    int lineLength = (int)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L);
+    wxTextPos lineLength = (wxTextPos)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L);

 
 

-    return (long)(lineLength);
+    return lineLength;

 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)


@@ -668,19 +696,15 @@ void wxComboBox::Remove(long from, long to)
 
 void wxComboBox::SetSelection(long from, long to)
 {
 
 void wxComboBox::SetSelection(long from, long to)
 {

-    HWND hWnd = GetHwnd();
-    long fromChar = from;
-    long toChar = to;
-    // if from and to are both -1, it means
-    // (in wxWidgets) that all text should be selected.
-    // This translates into Windows convention
-    if ((from == -1) && (to == -1))
+    // if from and to are both -1, it means (in wxWidgets) that all text should
+    // be selected, translate this into Windows convention
+    if ( (from == -1) && (to == -1) )

     {
     {

-      fromChar = 0;
-      toChar = -1;
+        from = 0;

     }
 
     }
 

-    if ( SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar)) == CB_ERR )
+    if ( SendMessage(GetHwnd(), CB_SETEDITSEL,
+                     0, (LPARAM)MAKELONG(from, to)) == CB_ERR )

     {
         wxLogDebug(_T("CB_SETEDITSEL failed"));
     }
     {
         wxLogDebug(_T("CB_SETEDITSEL failed"));
     }


@@ -689,10 +713,17 @@ void wxComboBox::SetSelection(long from, long to)
 void wxComboBox::GetSelection(long* from, long* to) const
 {
     DWORD dwStart, dwEnd;
 void wxComboBox::GetSelection(long* from, long* to) const
 {
     DWORD dwStart, dwEnd;

-    ::SendMessage(GetHwnd(), CB_GETEDITSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd);
-
-    *from = dwStart;
-    *to = dwEnd;
+    if ( ::SendMessage(GetHwnd(), CB_GETEDITSEL,
+                       (WPARAM)&dwStart, (LPARAM)&dwEnd) == CB_ERR )
+    {
+        *from =
+        *to = 0;
+    }
+    else
+    {
+        *from = dwStart;
+        *to = dwEnd;
+    }

 }
 
 int wxComboBox::GetSelection() const
 }
 
 int wxComboBox::GetSelection() const