non-PCH build fix (according to Tinderbox).

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 7c60aa5121b47135b369ad7036e5026d13a9f935..c85fcede27c1bdf0b1ee5d97e99c5a10c58dda76 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/combobox.cpp
+// Name:        src/msw/combobox.cpp

 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "combobox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,22 +26,22 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

+#include "wx/combobox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"

     #include "wx/settings.h"
     #include "wx/log.h"
     // for wxEVT_COMMAND_TEXT_ENTER
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     // for wxEVT_COMMAND_TEXT_ENTER
     #include "wx/textctrl.h"

+    #include "wx/app.h"
+    #include "wx/brush.h"

 #endif
 
 #endif
 

-#include "wx/combobox.h"
-#include "wx/brush.h"

 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/clipbrd.h"
 #include "wx/msw/private.h"
 
 #if wxUSE_TOOLTIPS

-    #if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
-        #include <commctrl.h>
-    #endif

     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 


@@ -65,7 +61,7 @@ wxBEGIN_FLAGS( wxComboBoxStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -94,25 +90,46 @@ wxEND_FLAGS( wxComboBoxStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)

-       wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )

     wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
 
     // TODO DELEGATES
     wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
 
     // TODO DELEGATES

-       wxPROPERTY( Font , wxFont , SetFont , GetFont  , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

     wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))

-       wxPROPERTY( Value ,wxString, SetValue, GetValue, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-       wxPROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY( Value ,wxString, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxComboBox)
 wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxComboBox)
 wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )

+

 #else
 #else

+

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

+

 #endif
 
 #endif
 

+BEGIN_EVENT_TABLE(wxComboBox, wxControl)
+    EVT_MENU(wxID_CUT, wxComboBox::OnCut)
+    EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
+    EVT_MENU(wxID_PASTE, wxComboBox::OnPaste)
+    EVT_MENU(wxID_UNDO, wxComboBox::OnUndo)
+    EVT_MENU(wxID_REDO, wxComboBox::OnRedo)
+    EVT_MENU(wxID_CLEAR, wxComboBox::OnDelete)
+    EVT_MENU(wxID_SELECTALL, wxComboBox::OnSelectAll)
+
+    EVT_UPDATE_UI(wxID_CUT, wxComboBox::OnUpdateCut)
+    EVT_UPDATE_UI(wxID_COPY, wxComboBox::OnUpdateCopy)
+    EVT_UPDATE_UI(wxID_PASTE, wxComboBox::OnUpdatePaste)
+    EVT_UPDATE_UI(wxID_UNDO, wxComboBox::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxComboBox::OnUpdateRedo)
+    EVT_UPDATE_UI(wxID_CLEAR, wxComboBox::OnUpdateDelete)
+    EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
+END_EVENT_TABLE()
+

 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------


@@ -152,6 +169,9 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:
         case WM_KEYUP:
         case WM_KEYDOWN:
         case WM_CHAR:

+        case WM_SYSCHAR:
+        case WM_SYSKEYDOWN:
+        case WM_SYSKEYUP:

         case WM_SETFOCUS:
         case WM_KILLFOCUS:
             {
         case WM_SETFOCUS:
         case WM_KILLFOCUS:
             {


@@ -178,7 +198,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
             {
                 wxCHECK_MSG( win, 0, _T("should have a parent") );
 
             {
                 wxCHECK_MSG( win, 0, _T("should have a parent") );
 

-                if ( win->GetWindowStyle() & wxPROCESS_ENTER )
+                if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )

                 {
                     // need to return a custom dlg code or we'll never get it
                     return DLGC_WANTMESSAGE;
                 {
                     // need to return a custom dlg code or we'll never get it
                     return DLGC_WANTMESSAGE;


@@ -186,74 +206,49 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
             }
             break;
 
             }
             break;
 

-        // deal with tooltips here
-#if wxUSE_TOOLTIPS && defined(TTN_NEEDTEXT)
-        case WM_NOTIFY:
-            {
-                wxCHECK_MSG( win, 0, _T("should have a parent") );
-
-                NMHDR* hdr = (NMHDR *)lParam;
-                if ( hdr->code == TTN_NEEDTEXT )
-                {
-                    wxToolTip *tooltip = win->GetToolTip();
-                    if ( tooltip )
-                    {
-                        TOOLTIPTEXT *ttt = (TOOLTIPTEXT *)lParam;
-                        ttt->lpszText = (wxChar *)tooltip->GetTip().c_str();
-                    }
-
-                    // processed
-                    return 0;
-                }
-            }
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            if( win->HandleClipboardEvent( message ) )
+                return 0;

             break;
             break;

-#endif // wxUSE_TOOLTIPS

     }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
 }
 
     }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
 }
 

-WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC,
-                                WXHWND WXUNUSED(pWnd),
-                                WXUINT WXUNUSED(nCtlColor),
-                                WXUINT WXUNUSED(message),
-                                WXWPARAM WXUNUSED(wParam),
-                                WXLPARAM WXUNUSED(lParam))
-{
-    HDC hdc = (HDC)pDC;
-    wxColour colBack = GetBackgroundColour();
-
-    if (!IsEnabled())
-        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
-    ::SetBkColor(hdc, wxColourToRGB(colBack));
-    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
-
-    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
-
-    return (WXHBRUSH)brush->GetResourceHandle();
-}
-

 // ----------------------------------------------------------------------------
 // wxComboBox callbacks
 // ----------------------------------------------------------------------------
 
 WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 // ----------------------------------------------------------------------------
 // wxComboBox callbacks
 // ----------------------------------------------------------------------------
 
 WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {

-    // handle WM_CTLCOLOR messages from our EDIT control to be able to set its
-    // colour correctly (to be the same as our own one)
+    // TODO: handle WM_CTLCOLOR messages from our EDIT control to be able to
+    //       set its colour correctly (to be the same as our own one)
+

     switch ( nMsg )
     {
     switch ( nMsg )
     {

-        // we have to handle both: one for the normal case and the other for
-        // wxCB_READONLY
-        case WM_CTLCOLOREDIT:
-        case WM_CTLCOLORSTATIC:
-            WXWORD nCtlColor;
-            WXHDC hdc;
-            WXHWND hwnd;
-            UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
-
-            return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor, nMsg, wParam, lParam);
+        case WM_SIZE:
+        // wxStaticBox can generate this message, when modifying the control's style.
+        // This causes the content of the combobox to be selected, for some reason.
+        case WM_STYLECHANGED:
+            {
+                // combobox selection sometimes spontaneously changes when its
+                // size changes, restore it to the old value if necessary
+                long fromOld, toOld;
+                GetSelection(&fromOld, &toOld);
+                WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
+
+                long fromNew, toNew;
+                GetSelection(&fromNew, &toNew);
+
+                if ( fromOld != fromNew || toOld != toNew )
+                {
+                    SetSelection(fromOld, toOld);
+                }
+
+                return result;
+            }

     }
 
     return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
     }
 
     return wxChoice::MSWWindowProc(nMsg, wParam, lParam);


@@ -268,18 +263,34 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
             // when Enter is pressed
             if ( wParam == VK_RETURN )
             {
             // when Enter is pressed
             if ( wParam == VK_RETURN )
             {

+                if (SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0))
+                    return false;
+            

                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);

-                InitCommandEvent(event);
+
+                const int sel = GetSelection();
+                event.SetInt(sel);

                 event.SetString(GetValue());
                 event.SetString(GetValue());

-                event.SetInt(GetSelection());
-                ProcessCommand(event);
+                InitCommandEventWithItems(event, sel);
+
+                if ( ProcessCommand(event) )
+                {
+                    // don't let the event through to the native control
+                    // because it doesn't need it and may generate an annoying
+                    // beep if it gets it
+                    return true;
+                }

             }
             }

+            // fall through

 
 

-            return HandleChar(wParam, lParam, TRUE /* isASCII */);
+        case WM_SYSCHAR:
+            return HandleChar(wParam, lParam, true /* isASCII */);

 
 

+        case WM_SYSKEYDOWN:

         case WM_KEYDOWN:
             return HandleKeyDown(wParam, lParam);
 
         case WM_KEYDOWN:
             return HandleKeyDown(wParam, lParam);
 

+        case WM_SYSKEYUP:

         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);
 
         case WM_KEYUP:
             return HandleKeyUp(wParam, lParam);
 


@@ -290,31 +301,41 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
             return HandleKillFocus((WXHWND)wParam);
     }
 
             return HandleKillFocus((WXHWND)wParam);
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)

 {
 {

-    wxString value;

     int sel = -1;
     int sel = -1;

+    wxString value;
+

     switch ( param )
     {
     switch ( param )
     {

-        case CBN_SELCHANGE:
+        case CBN_SELENDOK:
+#ifndef __SMARTPHONE__
+            // we need to reset this to prevent the selection from being undone
+            // by wxChoice, see wxChoice::MSWCommand() and comments there
+            m_lastAcceptedSelection = wxID_NONE;
+#endif
+
+            // set these variables so that they could be also fixed in
+            // CBN_EDITCHANGE below

             sel = GetSelection();
             sel = GetSelection();

-            if ( sel > -1 )
-            {
-                value = GetString(sel);
+            value = GetStringSelection();
+
+            // this string is going to become the new combobox value soon but
+            // we need it to be done right now, otherwise the event handler
+            // could get a wrong value when it calls our GetValue()
+            ::SetWindowText(GetHwnd(), value);

 
 

+            {

                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
                 event.SetInt(sel);
                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
                 event.SetInt(sel);

-                event.SetEventObject(this);

                 event.SetString(value);
                 event.SetString(value);

+                InitCommandEventWithItems(event, sel);
+

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

-            else
-            {
-                break;
-            }

 
             // fall through: for compability with wxGTK, also send the text
             // update event when the selection changes (this also seems more
 
             // fall through: for compability with wxGTK, also send the text
             // update event when the selection changes (this also seems more


@@ -324,39 +345,26 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
 
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
 

-                // 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 was already initialized above

                 if ( sel == -1 )
                 {
                 if ( sel == -1 )
                 {

-                    value = GetValue();
-                }
-                else // we're synthesizing text updated event from sel change
-                {
-                    // We need to retrieve the current selection because the user
-                    // may have changed it in the previous handler (for CBN_SELCHANGE
-                    // above).
-                    sel = GetSelection();
-                    if ( sel > -1 )
-                    {
-                        value = GetString(sel);
-                    }
-                    // 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);
+                    value = wxGetWindowText(GetHwnd());

                 }
 
                 event.SetString(value);
                 }
 
                 event.SetString(value);

-                event.SetEventObject(this);
+                InitCommandEventWithItems(event, sel);
+

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

+
+        default:
+            return wxChoice::MSWCommand(param, id);

     }
 
     }
 

-    // there is no return value for the CBN_ notifications, so always return
-    // FALSE from here to pass the message to DefWindowProc()
-    return FALSE;
+    // skip wxChoice version as it would generate its own events for
+    // CBN_SELENDOK
+    return wxControl::MSWCommand(param, id);

 }
 
 WXHWND wxComboBox::GetEditHWND() const
 }
 
 WXHWND wxComboBox::GetEditHWND() const


@@ -393,11 +401,11 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     // pretend that wxComboBox is hidden while it is positioned and resized and
     // show it only right before leaving this method because otherwise there is
     // some noticeable flicker while the control rearranges itself
     // pretend that wxComboBox is hidden while it is positioned and resized and
     // show it only right before leaving this method because otherwise there is
     // some noticeable flicker while the control rearranges itself

-    m_isShown = FALSE;
+    m_isShown = false;

 
     if ( !CreateAndInit(parent, id, pos, size, n, choices, style,
                         validator, name) )
 
     if ( !CreateAndInit(parent, id, pos, size, n, choices, style,
                         validator, name) )

-        return FALSE;
+        return false;

 
     // we shouldn't call SetValue() for an empty string because this would
     // (correctly) result in an assert with a read only combobox and is useless
 
     // we shouldn't call SetValue() for an empty string because this would
     // (correctly) result in an assert with a read only combobox and is useless


@@ -410,14 +418,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     // edit control, we must subclass it as well
     if ( !(style & wxCB_READONLY) )
     {
     // edit control, we must subclass it as well
     if ( !(style & wxCB_READONLY) )
     {

-        gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(),
-                                         wxComboEditWndProc);
+        gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(), wxComboEditWndProc);

     }
 
     // and finally, show the control
     }
 
     // and finally, show the control

-    Show(TRUE);
+    Show(true);

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,


@@ -442,6 +449,11 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
                       );
 
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
                       );
 

+    // usually WS_TABSTOP is added by wxControl::MSWGetStyle() but as we're
+    // created hidden (see Create() above), it is not done for us but we still
+    // want to have this style
+    msStyle |= WS_TABSTOP;
+

     // remove the style always added by wxChoice
     msStyle &= ~CBS_DROPDOWNLIST;
 
     // remove the style always added by wxChoice
     msStyle &= ~CBS_DROPDOWNLIST;
 


@@ -466,6 +478,11 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------
 
 // wxComboBox text control-like methods
 // ----------------------------------------------------------------------------
 

+wxString wxComboBox::GetValue() const
+{
+    return wxGetWindowText(m_hWnd);
+}
+

 void wxComboBox::SetValue(const wxString& value)
 {
     if ( HasFlag(wxCB_READONLY) )
 void wxComboBox::SetValue(const wxString& value)
 {
     if ( HasFlag(wxCB_READONLY) )


@@ -477,24 +494,114 @@ void wxComboBox::SetValue(const wxString& value)
 // Clipboard operations
 void wxComboBox::Copy()
 {
 // Clipboard operations
 void wxComboBox::Copy()
 {

-  SendMessage(GetHwnd(), WM_COPY, 0, 0L);
+    SendMessage(GetHwnd(), WM_COPY, 0, 0L);

 }
 
 void wxComboBox::Cut()
 {
 }
 
 void wxComboBox::Cut()
 {

-  SendMessage(GetHwnd(), WM_CUT, 0, 0L);
+    SendMessage(GetHwnd(), WM_CUT, 0, 0L);

 }
 
 void wxComboBox::Paste()
 {
 }
 
 void wxComboBox::Paste()
 {

-  SendMessage(GetHwnd(), WM_PASTE, 0, 0L);
+    SendMessage(GetHwnd(), WM_PASTE, 0, 0L);
+}
+
+void wxComboBox::Undo()
+{
+    if (CanUndo())
+    {
+        HWND hEditWnd = (HWND) GetEditHWND();
+        if ( hEditWnd )
+            ::SendMessage(hEditWnd, EM_UNDO, 0, 0);
+    }
+}
+
+void wxComboBox::Redo()
+{
+    if (CanUndo())
+    {
+        // Same as Undo, since Undo undoes the undo, i.e. a redo.
+        HWND hEditWnd = (HWND) GetEditHWND();
+        if ( hEditWnd )
+            ::SendMessage(hEditWnd, EM_UNDO, 0, 0);
+    }
+}
+
+void wxComboBox::SelectAll()
+{
+    SetSelection(0, GetLastPosition());
+}
+
+bool wxComboBox::CanUndo() const
+{
+    if (!IsEditable())
+        return false;
+
+    HWND hEditWnd = (HWND) GetEditHWND();
+    if ( hEditWnd )
+        return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
+    else
+        return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+    if (!IsEditable())
+        return false;
+
+    HWND hEditWnd = (HWND) GetEditHWND();
+    if ( hEditWnd )
+        return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
+    else
+        return false;
+}
+
+bool wxComboBox::HasSelection() const
+{
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;
+}
+
+bool wxComboBox::CanCopy() const
+{
+    // Can copy if there's a selection
+    return HasSelection();

 }
 
 }
 

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

 {
 {

-  // Can't implement in MSW?
-//  HWND hWnd = GetHwnd();
-//  SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
+    return IsEditable() && CanCopy();
+}
+
+bool wxComboBox::CanPaste() const
+{
+    if ( !IsEditable() )
+        return false;
+
+    // Standard edit control: check for straight text on clipboard
+    if ( !::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) )
+        return false;
+
+    bool isTextAvailable = ::IsClipboardFormatAvailable(CF_TEXT) != 0;
+    ::CloseClipboard();
+
+    return isTextAvailable;
+}
+
+bool wxComboBox::IsEditable() const
+{
+    return !HasFlag(wxCB_READONLY);
+}
+
+void wxComboBox::SetEditable(bool editable)
+{
+    HWND hWnd = (HWND)GetEditHWND();
+    if ( !::SendMessage(hWnd, EM_SETREADONLY, !editable, 0) )
+    {
+        wxLogLastError(_T("SendMessage(EM_SETREADONLY)"));
+    }

 }
 
 void wxComboBox::SetInsertionPoint(long pos)
 }
 
 void wxComboBox::SetInsertionPoint(long pos)


@@ -502,10 +609,9 @@ void wxComboBox::SetInsertionPoint(long pos)
     if ( GetWindowStyle() & wxCB_READONLY )
         return;
 
     if ( GetWindowStyle() & wxCB_READONLY )
         return;
 

-#ifdef __WIN32__

     HWND hWnd = GetHwnd();
     ::SendMessage(hWnd, CB_SETEDITSEL, 0, MAKELPARAM(pos, pos));
     HWND hWnd = GetHwnd();
     ::SendMessage(hWnd, CB_SETEDITSEL, 0, MAKELPARAM(pos, pos));

-    HWND hEditWnd = (HWND) GetEditHWND() ;
+    HWND hEditWnd = (HWND) GetEditHWND();

     if ( hEditWnd )
     {
         // Scroll insertion point into view
     if ( hEditWnd )
     {
         // Scroll insertion point into view


@@ -513,7 +619,6 @@ void wxComboBox::SetInsertionPoint(long pos)
         // Why is this necessary? (Copied from wxTextCtrl::SetInsertionPoint)
         SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM) wxEmptyString);
     }
         // Why is this necessary? (Copied from wxTextCtrl::SetInsertionPoint)
         SendMessage(hEditWnd, EM_REPLACESEL, 0, (LPARAM) wxEmptyString);
     }

-#endif // __WIN32__

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


@@ -521,30 +626,28 @@ 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 first character of the selection in
+    // its low-order word
+    DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
+    return LOWORD(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)


@@ -557,6 +660,10 @@ void wxComboBox::Replace(long from, long to, const wxString& value)
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);

+#else
+    wxUnusedVar(from);
+    wxUnusedVar(to);
+    wxUnusedVar(value);

 #endif
 }
 
 #endif
 }
 


@@ -569,29 +676,111 @@ 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 wxWindows) 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 (
-#ifdef __WIN32__
-    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)0, (LPARAM)MAKELONG(fromChar, toChar))
-#else // Win16
-    SendMessage(hWnd, CB_SETEDITSEL, (WPARAM)fromChar, (LPARAM)toChar)
-#endif
-        == CB_ERR )
+    if ( SendMessage(GetHwnd(), CB_SETEDITSEL,
+                     0, (LPARAM)MAKELONG(from, to)) == CB_ERR )

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

-#endif // wxUSE_COMBOBOX
+void wxComboBox::GetSelection(long* from, long* to) const
+{
+    DWORD dwStart, dwEnd;
+    if ( ::SendMessage(GetHwnd(), CB_GETEDITSEL,
+                       (WPARAM)&dwStart, (LPARAM)&dwEnd) == CB_ERR )
+    {
+        *from =
+        *to = 0;
+    }
+    else
+    {
+        *from = dwStart;
+        *to = dwEnd;
+    }
+}

 
 

+// ----------------------------------------------------------------------------
+// standard event handling
+// ----------------------------------------------------------------------------
+
+void wxComboBox::OnCut(wxCommandEvent& WXUNUSED(event))
+{
+    Cut();
+}
+
+void wxComboBox::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+    Copy();
+}
+
+void wxComboBox::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+    Paste();
+}
+
+void wxComboBox::OnUndo(wxCommandEvent& WXUNUSED(event))
+{
+    Undo();
+}
+
+void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
+{
+    Redo();
+}
+
+void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
+{
+    long from, to;
+    GetSelection(& from, & to);
+    if (from != -1 && to != -1)
+        Remove(from, to);
+}
+
+void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
+{
+    SetSelection(-1, -1);
+}
+
+void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
+{
+    event.Enable( CanCut() );
+}
+
+void wxComboBox::OnUpdateCopy(wxUpdateUIEvent& event)
+{
+    event.Enable( CanCopy() );
+}
+
+void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)
+{
+    event.Enable( CanPaste() );
+}
+
+void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanUndo() );
+}
+
+void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanRedo() );
+}
+
+void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
+{
+    event.Enable(HasSelection() && IsEditable());
+}
+
+void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
+{
+    event.Enable(GetLastPosition() > 0);
+}
+
+#endif // wxUSE_COMBOBOX