Fix wxFileConfig for WinCE

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

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index a01a5d9d2496df15fbeecb325fcc4e49271d5a7f..04c3639c910e7fa12ee69d8b6e90c68cbcf9a30e 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -37,6 +37,7 @@
     #include "wx/textctrl.h"
 #endif
 
     #include "wx/textctrl.h"
 #endif
 

+#include "wx/app.h"

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


@@ -65,7 +66,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 +95,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
 // ----------------------------------------------------------------------------


@@ -127,7 +149,7 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
 // ---------------------------------------------------------------------------
 
 // the pointer to standard radio button wnd proc
 // ---------------------------------------------------------------------------
 
 // the pointer to standard radio button wnd proc

-static WXFARPROC gs_wndprocEdit = (WXFARPROC)NULL;
+static WNDPROC gs_wndprocEdit = (WNDPROC)NULL;

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


@@ -213,30 +235,49 @@ 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 WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
-                               WXUINT WXUNUSED(message),
-                               WXWPARAM WXUNUSED(wParam),
-                               WXLPARAM WXUNUSED(lParam)
-    )
+// ----------------------------------------------------------------------------
+// wxComboBox callbacks
+// ----------------------------------------------------------------------------
+
+WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-    HDC hdc = (HDC)pDC;
-    wxColour colBack = GetBackgroundColour();
+    bool isSize = false;
+    long fromOld, toOld;
+
+    // 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 )
+    {
+        case CB_SETCURSEL:
+            // Selection was set with SetSelection.  Update the value too.
+            if ((int)wParam > GetCount())
+                m_value = wxEmptyString;
+            else
+                m_value = GetString(wParam);
+            m_selectionOld = -1;
+            break;
+        case WM_SIZE:
+            GetSelection(&fromOld, &toOld);
+            isSize = true;
+            break;
+    }

 
 

-    if (!IsEnabled())
-        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+    WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);

 
 

-    ::SetBkColor(hdc, wxColourToRGB(colBack));
-    ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    if(isSize)
+    {
+        long fromNew, toNew;
+        GetSelection(&fromNew, &toNew);

 
 

-    wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
+        if ( fromOld != fromNew || toOld != toNew )
+        {
+            SetSelection(fromOld, toOld);
+        }
+    }

 
 

-    return (WXHBRUSH)brush->GetResourceHandle();
+    return result;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxComboBox
-// ----------------------------------------------------------------------------
-

 bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 {
     switch ( msg )
 bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
 {
     switch ( msg )


@@ -250,10 +291,16 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 event.SetInt(GetSelection());
                 InitCommandEvent(event);
                 event.SetString(GetValue());
                 event.SetInt(GetSelection());

-                ProcessCommand(event);
+                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;
+                }

             }
 
             }
 

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

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


@@ -268,7 +315,7 @@ 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 WXUNUSED(id))


@@ -277,20 +324,34 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     int sel = -1;
     switch ( param )
     {
     int sel = -1;
     switch ( param )
     {

+        case CBN_SELENDOK:

         case CBN_SELCHANGE:
             sel = GetSelection();
         case CBN_SELCHANGE:
             sel = GetSelection();

-            if ( sel > -1 )
+
+            // we may sometimes get 2 CBN_SELCHANGE events or a CBN_SELENDOK
+            // before CBN_SELCHANGE with the same index when the user selects
+            // an item in the combobox -- ignore duplicates
+            if ( sel > -1 && sel != m_selectionOld )

             {
             {

-                value = GetString(sel);
+                m_selectionOld = sel;
+
+                // GetValue() would still return the old value from here but
+                // according to the docs we should return the new value if the
+                // user calls it in his event handler, so update internal
+                // m_value
+                m_value = GetString(sel);

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

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

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

-            else
+            else // no valid selection

             {
             {

+                m_selectionOld = sel;
+
+                // hence no EVT_TEXT neither

                 break;
             }
 
                 break;
             }
 


@@ -307,17 +368,22 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
                 // want the new one)
                 if ( sel == -1 )
                 {
                 // want the new one)
                 if ( sel == -1 )
                 {

-                    value = GetValue();
+                    m_value = wxGetWindowText(GetHwnd());
+                    m_selectionOld = -1;

                 }
                 else // we're synthesizing text updated event from sel change
                 {
                 }
                 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);
+                    // 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 )
+                    {
+                        m_value = GetString(sel);
+                    }

                 }
 
                 }
 

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

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


@@ -325,8 +391,8 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     }
 
     // there is no return value for the CBN_ notifications, so always return
     }
 
     // there is no return value for the CBN_ notifications, so always return

-    // FALSE from here to pass the message to DefWindowProc()
-    return FALSE;
+    // false from here to pass the message to DefWindowProc()
+    return false;

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


@@ -347,6 +413,10 @@ WXHWND wxComboBox::GetEditHWND() const
     return (WXHWND)hwndEdit;
 }
 
     return (WXHWND)hwndEdit;
 }
 

+// ----------------------------------------------------------------------------
+// wxComboBox creation
+// ----------------------------------------------------------------------------
+

 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,


@@ -359,15 +429,63 @@ 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) )
+        return false;

 
 

-    // first create wxWin object
-    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        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
+    // for the other ones anyhow
+    if ( !value.empty() )
+        SetValue(value);
+
+    // 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
+    if ( !(style & wxCB_READONLY) )
+    {
+        gs_wndprocEdit = wxSetWindowProc((HWND)GetEditHWND(),
+                                         wxComboEditWndProc);
+    }
+
+    // and finally, show the control
+    Show(true);
+
+    return true;
+}
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, value, pos, size, chs.GetCount(),
+                  chs.GetStrings(), style, validator, name);
+}
+
+WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    // we never have an external border
+    WXDWORD msStyle = wxChoice::MSWGetStyle
+                      (
+                        (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;

 
 

-    // get the right style
-    long msStyle = WS_TABSTOP | WS_VSCROLL | WS_HSCROLL |
-                   CBS_AUTOHSCROLL | CBS_NOINTEGRALHEIGHT /* | WS_CLIPSIBLINGS */;

     if ( style & wxCB_READONLY )
         msStyle |= CBS_DROPDOWNLIST;
 #ifndef __WXWINCE__
     if ( style & wxCB_READONLY )
         msStyle |= CBS_DROPDOWNLIST;
 #ifndef __WXWINCE__


@@ -377,76 +495,131 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     else
         msStyle |= CBS_DROPDOWN;
 
     else
         msStyle |= CBS_DROPDOWN;
 

-    if ( style & wxCB_SORT )
-        msStyle |= CBS_SORT;
+    // there is no reason to not always use CBS_AUTOHSCROLL, so do use it
+    msStyle |= CBS_AUTOHSCROLL;

 
 

-    if ( style & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
+    // NB: we used to also add CBS_NOINTEGRALHEIGHT here but why?

 
 

+    return msStyle;
+}

 
 

-    // and now create the MSW control
-    if ( !MSWCreateControl(_T("COMBOBOX"), msStyle) )
-        return FALSE;
+// ----------------------------------------------------------------------------
+// wxComboBox text control-like methods
+// ----------------------------------------------------------------------------

 
 

-    // A choice/combobox normally has a white background (or other, depending
-    // on global settings) rather than inheriting the parent's background colour.
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+void wxComboBox::SetValue(const wxString& value)
+{
+    if ( HasFlag(wxCB_READONLY) )
+        SetStringSelection(value);
+    else
+        SetWindowText(GetHwnd(), value.c_str());

 
 

-    for ( int i = 0; i < n; i++ )
-    {
-        Append(choices[i]);
-    }
+    m_value = value;
+    m_selectionOld = GetSelection();
+}
+
+// Clipboard operations
+void wxComboBox::Copy()
+{
+    SendMessage(GetHwnd(), WM_COPY, 0, 0L);
+}

 
 

-    if ( !value.IsEmpty() )
+void wxComboBox::Cut()
+{
+    SendMessage(GetHwnd(), WM_CUT, 0, 0L);
+}
+
+void wxComboBox::Paste()
+{
+    SendMessage(GetHwnd(), WM_PASTE, 0, 0L);
+}
+
+void wxComboBox::Undo()
+{
+    if (CanUndo())

     {
     {

-        SetValue(value);
+        HWND hEditWnd = (HWND) GetEditHWND() ;
+        if ( hEditWnd )
+            ::SendMessage(hEditWnd, EM_UNDO, 0, 0);

     }
     }

+}

 
 

-    // 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
-    if ( !(style & wxCB_READONLY) )
+void wxComboBox::Redo()
+{
+    if (CanUndo())

     {
     {

-        gs_wndprocEdit = (WXFARPROC)::SetWindowLong
-                                      (
-                                        (HWND)GetEditHWND(),
-                                        GWL_WNDPROC,
-                                        (LPARAM)wxComboEditWndProc
-                                      );
+        // Same as Undo, since Undo undoes the undo, i.e. a redo.
+        HWND hEditWnd = (HWND) GetEditHWND() ;
+        if ( hEditWnd )
+            ::SendMessage(hEditWnd, EM_UNDO, 0, 0);

     }
     }

+}

 
 

-    // and finally, show the control
-    Show(TRUE);
+void wxComboBox::SelectAll()
+{
+    SetSelection(0, GetLastPosition());
+}

 
 

-    return TRUE;
+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;

 }
 
 }
 

-void wxComboBox::SetValue(const wxString& value)
+bool wxComboBox::CanRedo() const

 {
 {

-    if ( HasFlag(wxCB_READONLY) )
-        SetStringSelection(value);
+    if (!IsEditable())
+        return false;
+    
+    HWND hEditWnd = (HWND) GetEditHWND() ;
+    if ( hEditWnd )
+        return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;

     else
     else

-        SetWindowText(GetHwnd(), value.c_str());
+        return false;

 }
 
 }
 

-// Clipboard operations
-void wxComboBox::Copy()
+bool wxComboBox::HasSelection() const

 {
 {

-  SendMessage(GetHwnd(), WM_COPY, 0, 0L);
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;

 }
 
 }
 

-void wxComboBox::Cut()
+bool wxComboBox::CanCopy() const

 {
 {

-  SendMessage(GetHwnd(), WM_CUT, 0, 0L);
+    // Can copy if there's a selection
+    return HasSelection();

 }
 
 }
 

-void wxComboBox::Paste()
+bool wxComboBox::CanCut() const

 {
 {

-  SendMessage(GetHwnd(), WM_PASTE, 0, 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 WXUNUSED(editable))
 }
 
 void wxComboBox::SetEditable(bool WXUNUSED(editable))


@@ -480,30 +653,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)


@@ -528,30 +700,117 @@ 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;
+    }
+}
+
+int wxComboBox::GetSelection() const
+{
+    return wxChoice::GetSelection();
+}
+
+// ----------------------------------------------------------------------------
+// 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