popup windows wre not using TOPMOST style under wxUniv any longer -- fixed

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 8626a568497c1597798ad18cdb189e63f06a08b0..aa72d70d57d8899452ab2e0967c389a89d2ca78c 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -25,13 +25,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_COMBOBOX
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_COMBOBOX
 
 #ifndef WX_PRECOMP

-#include "wx/settings.h"
+    #include "wx/settings.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"


@@ -40,7 +41,7 @@
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS

-    #ifndef __GNUWIN32_OLD__
+    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)

         #include <commctrl.h>
     #endif
     #include "wx/tooltip.h"
         #include <commctrl.h>
     #endif
     #include "wx/tooltip.h"


@@ -86,10 +87,13 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 
     switch ( message )
     {
 
     switch ( message )
     {

-        // forward some messages to the combobox
+        // forward some messages to the combobox to generate the appropriate
+        // wxEvents from them

         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:

+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:

             {
                 wxComboBox *combo = wxDynamicCast(win, wxComboBox);
                 wxCHECK_MSG( combo, 0, _T("should have combo as parent") );
             {
                 wxComboBox *combo = wxDynamicCast(win, wxComboBox);
                 wxCHECK_MSG( combo, 0, _T("should have combo as parent") );


@@ -114,7 +118,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 #endif // 0
 
         // deal with tooltips here
 #endif // 0
 
         // deal with tooltips here

-#if wxUSE_TOOLTIPS
+#if wxUSE_TOOLTIPS && defined(TTN_NEEDTEXT)

         case WM_NOTIFY:
             {
                 wxCHECK_MSG( win, 0, _T("should have a parent") );
         case WM_NOTIFY:
             {
                 wxCHECK_MSG( win, 0, _T("should have a parent") );


@@ -140,10 +144,17 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
 }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
 }
 

-WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+#if wxUSE_CTL3D

                                WXUINT message,
                                WXWPARAM wParam,
                                WXUINT message,
                                WXWPARAM wParam,

-                               WXLPARAM lParam)
+                               WXLPARAM lParam
+#else
+                               WXUINT WXUNUSED(message),
+                               WXWPARAM WXUNUSED(wParam),
+                               WXLPARAM WXUNUSED(lParam)
+#endif
+    )

 {
 #if wxUSE_CTL3D
     if ( m_useCtl3D )
 {
 #if wxUSE_CTL3D
     if ( m_useCtl3D )


@@ -162,7 +173,7 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())

-        colBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

 
     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
 
     ::SetBkColor(hdc, wxColourToRGB(colBack));
     ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));


@@ -188,6 +199,12 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);
 
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);

+
+        case WM_SETFOCUS:
+            return HandleSetFocus((WXHWND)wParam);
+
+        case WM_KILLFOCUS:
+            return HandleKillFocus((WXHWND)wParam);

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -195,23 +212,51 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 
 bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
 
 bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {

+    wxString value;
+    int sel = -1;

     switch ( param )
     {
         case CBN_SELCHANGE:
     switch ( param )
     {
         case CBN_SELCHANGE:

-            if (GetSelection() > -1)
+            sel = GetSelection();
+            if ( sel > -1 )

             {
             {

+                value = GetString(sel);
+

                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());

-                event.SetInt(GetSelection());
+                event.SetInt(sel);

                 event.SetEventObject(this);
                 event.SetEventObject(this);

-                event.SetString(GetStringSelection());
+                event.SetString(value);

                 ProcessCommand(event);
             }
                 ProcessCommand(event);
             }

-            break;
+            else
+            {
+                break;
+            }
+
+            // fall through: for compability with wxGTK, also send the text
+            // update event when the selection changes (this also seems more
+            // logical as the text does change)

 
         case CBN_EDITCHANGE:
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
 
         case CBN_EDITCHANGE:
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());

-                event.SetString(GetValue());
+
+                // if sel != -1, value was initialized above (and we can't use
+                // GetValue() here as it would return the old selection and we
+                // want the new one)
+                if ( sel == -1 )
+                {
+                    value = GetValue();
+                }
+                else // we're synthesizing text updated event from sel change
+                {
+                    // we need to do this because the user code expects
+                    // wxComboBox::GetValue() to return the new value from
+                    // "text updated" handler but it hadn't been updated yet
+                    SetValue(value);
+                }
+
+                event.SetString(value);

                 event.SetEventObject(this);
                 ProcessCommand(event);
             }
                 event.SetEventObject(this);
                 ProcessCommand(event);
             }


@@ -267,15 +312,17 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;
 
     if ( style & wxCB_SORT )
         msStyle |= CBS_SORT;
 

+    if ( style & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+
+

     // and now create the MSW control
     if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
         return FALSE;
 
     // and now create the MSW control
     if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
         return FALSE;
 

-    SetSize(pos.x, pos.y, size.x, size.y);
-

     // A choice/combobox normally has a white background (or other, depending
     // on global settings) rather than inheriting the parent's background colour.
     // A choice/combobox normally has a white background (or other, depending
     // on global settings) rather than inheriting the parent's background colour.

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

 
     for ( int i = 0; i < n; i++ )
     {
 
     for ( int i = 0; i < n; i++ )
     {


@@ -287,6 +334,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         SetValue(value);
     }
 
         SetValue(value);
     }
 

+    // do this after appending the values to the combobox so that autosizing
+    // works correctly
+    SetSize(pos.x, pos.y, size.x, size.y);
+

     // a (not read only) combobox is, in fact, 2 controls: the combobox itself
     // and an edit control inside it and if we want to catch events from this
     // edit control, we must subclass it as well
     // a (not read only) combobox is, in fact, 2 controls: the combobox itself
     // and an edit control inside it and if we want to catch events from this
     // edit control, we must subclass it as well


@@ -357,7 +408,7 @@ void wxComboBox::Paste()
   SendMessage(hWnd, WM_PASTE, 0, 0L);
 }
 
   SendMessage(hWnd, WM_PASTE, 0, 0L);
 }
 

-void wxComboBox::SetEditable(bool editable)
+void wxComboBox::SetEditable(bool WXUNUSED(editable))

 {
   // Can't implement in MSW?
 //  HWND hWnd = GetHwnd();
 {
   // Can't implement in MSW?
 //  HWND hWnd = GetHwnd();


@@ -366,92 +417,72 @@ void wxComboBox::SetEditable(bool editable)
 
 void wxComboBox::SetInsertionPoint(long pos)
 {
 
 void wxComboBox::SetInsertionPoint(long pos)
 {

-/*
-  HWND hWnd = GetHwnd();
+    if ( GetWindowStyle() & wxCB_READONLY )
+        return;
+

 #ifdef __WIN32__
 #ifdef __WIN32__

-  SendMessage(hWnd, EM_SETSEL, pos, pos);
-  SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
-#else
-  SendMessage(hWnd, EM_SETSEL, 0, MAKELPARAM(pos, pos));
-#endif
-  char *nothing = "";
-  SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
-*/
+    HWND hWnd = GetHwnd();
+    ::SendMessage(hWnd, CB_SETEDITSEL, 0, MAKELPARAM(pos, pos));
+    HWND hEditWnd = (HWND) GetEditHWND() ;
+    if ( hEditWnd )
+    {
+        // Scroll insertion point into view
+        SendMessage(hEditWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+        // Why is this necessary? (Copied from wxTextCtrl::SetInsertionPoint)
+        SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM)_T(""));
+    }
+#endif // __WIN32__

 }
 
 void wxComboBox::SetInsertionPointEnd()
 {
 }
 
 void wxComboBox::SetInsertionPointEnd()
 {

-/*
-  long pos = GetLastPosition();
-  SetInsertionPoint(pos);
-*/
+    // setting insertion point doesn't make sense for read only comboboxes
+    if ( !(GetWindowStyle() & wxCB_READONLY) )
+    {
+        long pos = GetLastPosition();
+        SetInsertionPoint(pos);
+    }

 }
 
 long wxComboBox::GetInsertionPoint() const
 {
 }
 
 long wxComboBox::GetInsertionPoint() const
 {

-/*
-  DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
-  return Pos&0xFFFF;
-*/
-  return 0;
+#ifdef __WIN32__
+    DWORD Pos=(DWORD)SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
+    return Pos&0xFFFF;
+#else
+    return 0;
+#endif

 }
 
 long wxComboBox::GetLastPosition() const
 {
 }
 
 long wxComboBox::GetLastPosition() const
 {

-/*
-    HWND hWnd = GetHwnd();
-
-    // Will always return a number > 0 (according to docs)
-    int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L);
-
-    // This gets the char index for the _beginning_ of the last line
-    int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);
+    HWND hEditWnd = (HWND) GetEditHWND();

 
 

-    // Get number of characters in the last line. We'll add this to the character
+    // Get number of characters in the last (only) line. We'll add this to the character

     // index for the last line, 1st position.
     // index for the last line, 1st position.

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

 
 

-    return (long)(charIndex + lineLength);
-*/
-  return 0;
+    return (long)(lineLength);

 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
 #if wxUSE_CLIPBOARD
 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
 #if wxUSE_CLIPBOARD

-    HWND hWnd = GetHwnd();
-    long fromChar = from;
-    long toChar = to;
-
-    // Set selection and remove it
-#ifdef __WIN32__
-    SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
-#else
-    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
-#endif
-    SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
+    Remove(from, to);

 
     // Now replace with 'value', by pasting.
     wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);
 
     // Paste into edit control
 
     // Now replace with 'value', by pasting.
     wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);
 
     // Paste into edit control

-    SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
+    SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);

 #endif
 }
 
 void wxComboBox::Remove(long from, long to)
 {
 #endif
 }
 
 void wxComboBox::Remove(long from, long to)
 {

-    HWND hWnd = GetHwnd();
-    long fromChar = from;
-    long toChar = to;
-
-    // Cut all selected text
-#ifdef __WIN32__
-    SendMessage(hWnd, CB_SETEDITSEL, fromChar, toChar);
-#else
-    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
-#endif
-    SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
+    // Set selection and remove it
+    SetSelection(from, to);
+    SendMessage(GetHwnd(), WM_CUT, (WPARAM)0, (LPARAM)0);

 }
 
 void wxComboBox::SetSelection(long from, long to)
 }
 
 void wxComboBox::SetSelection(long from, long to)


@@ -468,56 +499,16 @@ void wxComboBox::SetSelection(long from, long to)
       toChar = -1;
     }
 
       toChar = -1;
     }
 

+    if (

 #ifdef __WIN32__
 #ifdef __WIN32__

-    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar);
-//    SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
-#else
-    // WPARAM is 0: selection is scrolled into view
-    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar));
+    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar))
+#else // Win16
+    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar)

 #endif
 #endif

-}
-
-void wxComboBox::DoMoveWindow(int x, int y, int width, int height)
-{
-    // here is why this is necessary: if the width is negative, the combobox
-    // window proc makes the window of the size width*height instead of
-    // interpreting height in the usual manner (meaning the height of the drop
-    // down list - usually the height specified in the call to MoveWindow()
-    // will not change the height of combo box per se)
-    //
-    // this behaviour is not documented anywhere, but this is just how it is
-    // here (NT 4.4) and, anyhow, the check shouldn't hurt - however without
-    // the check, constraints/sizers using combos may break the height
-    // constraint will have not at all the same value as expected
-    if ( width < 0 )
-        return;
-
-    int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-
-    // what should the height of the drop down list be? we choose 10 items by
-    // default and also 10 items max (if we always use n, the list will never
-    // have vertical scrollbar)
-    int n = GetCount();
-    if ( !n || (n > 10) )
-        n = 10;
-
-    height = (n + 1)* EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-
-    wxControl::DoMoveWindow(x, y, width, height);
-}
-
-wxSize wxComboBox::DoGetBestSize() const
-{
-    // the choice calculates the horz size correctly, but not the vertical
-    // component: correct it
-    wxSize size = wxChoice::DoGetBestSize();
-
-    int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-    size.y = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-
-    return size;
+        == CB_ERR )
+    {
+        wxLogDebug(_T("CB_SETEDITSEL failed"));
+    }

 }
 
 #endif
 }
 
 #endif