Build fix.

[wxWidgets.git] / src / common / combocmn.cpp

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e2cb098146a7688fa5e4afc0d4b84c7d3b9e3593..666049997dc4434d3b3f8c3f605852637d109281 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -25,17 +25,18 @@
 
 #if wxUSE_COMBOCTRL
 
 
 #if wxUSE_COMBOCTRL
 

+#include "wx/combobox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/combobox.h"

     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"

+    #include "wx/timer.h"

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

-#include "wx/timer.h"

 
 #include "wx/combo.h"
 
 
 #include "wx/combo.h"
 


@@ -139,7 +140,7 @@ class wxComboFrameEventHandler : public wxEvtHandler
 {
 public:
     wxComboFrameEventHandler( wxComboCtrlBase* pCb );
 {
 public:
     wxComboFrameEventHandler( wxComboCtrlBase* pCb );

-    ~wxComboFrameEventHandler();
+    virtual ~wxComboFrameEventHandler();

 
     void OnPopup();
 
 
     void OnPopup();
 


@@ -190,7 +191,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
 {
     wxWindow* winFocused = ::wxWindow::FindFocus();
 
 {
     wxWindow* winFocused = ::wxWindow::FindFocus();
 

-    wxWindow* popup = m_combo->GetPopupControl();
+    wxWindow* popup = m_combo->GetPopupControl()->GetControl();

     wxWindow* winpopup = m_combo->GetPopupWindow();
 
     if (
     wxWindow* winpopup = m_combo->GetPopupWindow();
 
     if (


@@ -385,7 +386,7 @@ void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
 {
     if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
     {
 {
     if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
     {

-        combo->DrawFocusBackground(dc,rect,0);
+        combo->PrepareBackground(dc,rect,0);

 
         dc.DrawText( combo->GetValue(),
                      rect.x + combo->GetTextIndent(),
 
         dc.DrawText( combo->GetValue(),
                      rect.x + combo->GetTextIndent(),


@@ -426,8 +427,7 @@ void wxComboPopup::Dismiss()
 // ----------------------------------------------------------------------------
 
 //
 // ----------------------------------------------------------------------------
 
 //

-// This is pushed to the event handler queue of either combo box
-// or its textctrl (latter if not readonly combo).
+// This is pushed to the event handler queue of the child textctrl.

 //
 class wxComboBoxExtraInputHandler : public wxEvtHandler
 {
 //
 class wxComboBoxExtraInputHandler : public wxEvtHandler
 {


@@ -438,7 +438,7 @@ public:
     {
         m_combo = combo;
     }
     {
         m_combo = combo;
     }

-    ~wxComboBoxExtraInputHandler() { }
+    virtual ~wxComboBoxExtraInputHandler() { }

     void OnKey(wxKeyEvent& event);
     void OnFocus(wxFocusEvent& event);
 
     void OnKey(wxKeyEvent& event);
     void OnFocus(wxFocusEvent& event);
 


@@ -458,56 +458,16 @@ END_EVENT_TABLE()
 
 void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
 {
 
 void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
 {

-    int keycode = event.GetKeyCode();
-
-    if ( keycode == WXK_TAB )
-    {
-        wxNavigationKeyEvent evt;
-        evt.SetFlags(wxNavigationKeyEvent::FromTab|
-                     (!event.ShiftDown()?wxNavigationKeyEvent::IsForward:
-                                         wxNavigationKeyEvent::IsBackward));
-        evt.SetEventObject(m_combo);
-        m_combo->GetParent()->GetEventHandler()->AddPendingEvent(evt);
-        return;
-    }
+    // Let the wxComboCtrl event handler have a go first.
+    wxComboCtrlBase* combo = m_combo;
+    wxObject* prevObj = event.GetEventObject();

 
 

-    if ( m_combo->IsPopupShown() )
-    {
-        // pass it to the popped up control
-        m_combo->GetPopupControl()->GetControl()->AddPendingEvent(event);
-    }
-    else // no popup
-    {
-        int comboStyle = m_combo->GetWindowStyle();
-        wxComboPopup* popupInterface = m_combo->GetPopupControl();
+    event.SetId(combo->GetId());
+    event.SetEventObject(combo);
+    combo->GetEventHandler()->ProcessEvent(event);

 
 

-        if ( !popupInterface )
-        {
-            event.Skip();
-            return;
-        }
-
-        if ( (comboStyle & wxCB_READONLY) ||
-             ( keycode != WXK_RIGHT && keycode != WXK_LEFT )
-            )
-        {
-            // Alternate keys: UP and DOWN show the popup instead of cycling
-            if ( (comboStyle & wxCC_ALT_KEYS) )
-            {
-                if ( keycode == WXK_UP || keycode == WXK_DOWN )
-                {
-                    m_combo->OnButtonClick();
-                    return;
-                }
-                else
-                    event.Skip();
-            }
-            else
-                popupInterface->OnComboKeyEvent(event);
-        }
-        else
-            event.Skip();
-    }
+    event.SetId(((wxWindow*)prevObj)->GetId());
+    event.SetEventObject(prevObj);

 }
 
 void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
 }
 
 void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)


@@ -522,17 +482,15 @@ void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
             m_combo->SetSelection(-1,-1);
     }
 
             m_combo->SetSelection(-1,-1);
     }
 

-    if ( event.GetId() != m_combo->GetId() )
-    {
-        // Add textctrl set focus events as combo set focus events
-        // NOTE: Simply changing the event and skipping didn't seem
-        // to do the trick.
-        wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
-        evt2.SetEventObject(m_combo);
-        m_combo->GetEventHandler()->ProcessEvent(evt2);
-    }
-    else
-        event.Skip();
+    // Send focus indication to parent.
+    // NB: This is needed for cases where the textctrl gets focus
+    //     instead of its parent. While this may trigger multiple
+    //     wxEVT_SET_FOCUSes (since m_text->SetFocus is called
+    //     from combo's focus event handler), they should be quite
+    //     harmless.
+    wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
+    evt2.SetEventObject(m_combo);
+    m_combo->GetEventHandler()->ProcessEvent(evt2);

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -552,7 +510,7 @@ public:
         m_combo = combo;
         m_beenInside = false;
     }
         m_combo = combo;
         m_beenInside = false;
     }

-    ~wxComboPopupExtraEventHandler() { }
+    virtual ~wxComboPopupExtraEventHandler() { }

 
     void OnMouseEvent( wxMouseEvent& event );
 
 
     void OnMouseEvent( wxMouseEvent& event );
 


@@ -644,6 +602,7 @@ BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
     EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
     EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
     //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
     EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
     EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
     //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)

+    EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)

     EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
     EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
 END_EVENT_TABLE()
     EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
     EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
 END_EVENT_TABLE()


@@ -663,7 +622,6 @@ void wxComboCtrlBase::Init()
     m_text = (wxTextCtrl*) NULL;
     m_popupInterface = (wxComboPopup*) NULL;
 
     m_text = (wxTextCtrl*) NULL;
     m_popupInterface = (wxComboPopup*) NULL;
 

-    m_extraEvtHandler = (wxEvtHandler*) NULL;

     m_popupExtraHandler = (wxEvtHandler*) NULL;
     m_textEvtHandler = (wxEvtHandler*) NULL;
 
     m_popupExtraHandler = (wxEvtHandler*) NULL;
     m_textEvtHandler = (wxEvtHandler*) NULL;
 


@@ -680,7 +638,7 @@ void wxComboCtrlBase::Init()
     m_btnState = 0;
     m_btnWidDefault = 0;
     m_blankButtonBg = false;
     m_btnState = 0;
     m_btnWidDefault = 0;
     m_blankButtonBg = false;

-    m_btnWid = m_btnHei = 0;
+    m_btnWid = m_btnHei = -1;

     m_btnSide = wxRIGHT;
     m_btnSpacingX = 0;
 
     m_btnSide = wxRIGHT;
     m_btnSpacingX = 0;
 


@@ -716,40 +674,45 @@ bool wxComboCtrlBase::Create(wxWindow *parent,
     OnThemeChange();
     m_absIndent = GetNativeTextIndent();
 
     OnThemeChange();
     m_absIndent = GetNativeTextIndent();
 

+    m_iFlags |= wxCC_IFLAG_CREATED;
+
+    // If x and y indicate valid size, wxSizeEvent won't be
+    // emitted automatically, so we need to add artifical one.
+    if ( size.x > 0 && size.y > 0 )
+    {
+        wxSizeEvent evt(size,GetId());
+        GetEventHandler()->AddPendingEvent(evt);
+    }
+

     return true;
 }
 
     return true;
 }
 

-void wxComboCtrlBase::InstallInputHandlers( bool alsoTextCtrl )
+void wxComboCtrlBase::InstallInputHandlers()

 {
 {

-    if ( m_text && alsoTextCtrl )
+    if ( m_text )

     {
         m_textEvtHandler = new wxComboBoxExtraInputHandler(this);
         m_text->PushEventHandler(m_textEvtHandler);
     }
     {
         m_textEvtHandler = new wxComboBoxExtraInputHandler(this);
         m_text->PushEventHandler(m_textEvtHandler);
     }

-
-    wxComboBoxExtraInputHandler* inputHandler = new wxComboBoxExtraInputHandler(this);
-    PushEventHandler(inputHandler);
-    m_extraEvtHandler = inputHandler;

 }
 
 }
 

-void wxComboCtrlBase::CreateTextCtrl( int extraStyle, const wxValidator& validator )
+void
+wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)

 {
     if ( !(m_windowStyle & wxCB_READONLY) )
     {
 {
     if ( !(m_windowStyle & wxCB_READONLY) )
     {

-        m_text = new wxTextCtrl(this,
-                                wxID_ANY,
-                                m_valueString,
-                                wxDefaultPosition,
-                                wxDefaultSize,
-                                // wxTE_PROCESS_TAB is needed because on Windows, wxTAB_TRAVERSAL is
-                                // not used by the wxPropertyGrid and therefore the tab is
-                                // processed by looking at ancestors to see if they have
-                                // wxTAB_TRAVERSAL. The navigation event is then sent to
-                                // the wrong window.
-                                wxTE_PROCESS_TAB |
-                                wxTE_PROCESS_ENTER |
-                                extraStyle,
-                                validator);
+        // wxTE_PROCESS_TAB is needed because on Windows, wxTAB_TRAVERSAL is
+        // not used by the wxPropertyGrid and therefore the tab is processed by
+        // looking at ancestors to see if they have wxTAB_TRAVERSAL. The
+        // navigation event is then sent to the wrong window.
+        style |= wxTE_PROCESS_TAB;
+
+        if ( HasFlag(wxTE_PROCESS_ENTER) )
+            style |= wxTE_PROCESS_ENTER;
+
+        m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
+                                wxDefaultPosition, wxDefaultSize,
+                                style, validator);

 
         // This is required for some platforms (GTK+ atleast)
         m_text->SetSizeHints(2,4);
 
         // This is required for some platforms (GTK+ atleast)
         m_text->SetSizeHints(2,4);


@@ -774,23 +737,12 @@ wxComboCtrlBase::~wxComboCtrlBase()
     m_toplevEvtHandler = (wxEvtHandler*) NULL;
 #endif
 
     m_toplevEvtHandler = (wxEvtHandler*) NULL;
 #endif
 

-    if ( m_popup )
-        m_popup->RemoveEventHandler(m_popupExtraHandler);
-
-    delete m_popupExtraHandler;
-
-    HidePopup();
-
-    delete m_popupInterface;
-    delete m_winPopup;
-
-    RemoveEventHandler(m_extraEvtHandler);
+    DestroyPopup();

 
     if ( m_text )
         m_text->RemoveEventHandler(m_textEvtHandler);
 
     delete m_textEvtHandler;
 
     if ( m_text )
         m_text->RemoveEventHandler(m_textEvtHandler);
 
     delete m_textEvtHandler;

-    delete m_extraEvtHandler;

 }
 
 
 }
 
 


@@ -803,7 +755,6 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
 {
     wxSize sz = GetClientSize();
     int customBorder = m_widthCustomBorder;
 {
     wxSize sz = GetClientSize();
     int customBorder = m_widthCustomBorder;

-    bool buttonOutside;

     int btnBorder; // border for button only
 
     // check if button should really be outside the border: we'll do it it if
     int btnBorder; // border for button only
 
     // check if button should really be outside the border: we'll do it it if


@@ -812,15 +763,13 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
     if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
                 (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
          m_btnSpacingX == 0 &&
     if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
                 (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
          m_btnSpacingX == 0 &&

-         m_btnHei == 0 )
+         m_btnHei <= 0 )

     {
     {

-        buttonOutside = true;

         m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
         btnBorder = 0;
     }
     else
     {
         m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
         btnBorder = 0;
     }
     else
     {

-        buttonOutside = false;

         m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
         btnBorder = customBorder;
     }
         m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
         btnBorder = customBorder;
     }


@@ -839,20 +788,32 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
     if ( butWidth <= 0 )
         return;
 
     if ( butWidth <= 0 )
         return;
 

+    int butHeight = sz.y - btnBorder*2;
+

     // Adjust button width
     // Adjust button width

-    if ( m_btnWid < 0 )
-        butWidth += m_btnWid;
-    else if ( m_btnWid > 0 )
+    if ( m_btnWid > 0 )

         butWidth = m_btnWid;
         butWidth = m_btnWid;

+    else
+    {
+        // Adjust button width to match aspect ratio
+        // (but only if control is smaller than best size).
+        int bestHeight = GetBestSize().y;
+        int height = GetSize().y;

 
 

-    int butHeight = sz.y;
-
-    butHeight -= btnBorder*2;
+        if ( height < bestHeight )
+        {
+            // Make very small buttons square, as it makes
+            // them accommodate arrow image better and still
+            // looks decent.
+            if ( height > 18 )
+                butWidth = (height*butWidth)/bestHeight;
+            else
+                butWidth = butHeight;
+        }
+    }

 
     // Adjust button height
 
     // Adjust button height

-    if ( m_btnHei < 0 )
-        butHeight += m_btnHei;
-    else if ( m_btnHei > 0 )
+    if ( m_btnHei > 0 )

         butHeight = m_btnHei;
 
     // Use size of normal bitmap if...
         butHeight = m_btnHei;
 
     // Use size of normal bitmap if...


@@ -880,7 +841,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
         if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
         {
             int newY = butHeight+(customBorder*2);
         if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
         {
             int newY = butHeight+(customBorder*2);

-            SetClientSize(-1,newY);
+            SetClientSize(wxDefaultCoord,newY);

             sz.y = newY;
         }
     }
             sz.y = newY;
         }
     }


@@ -998,14 +959,6 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
     return ret;
 }
 
     return ret;
 }
 

-void wxComboCtrlBase::DoMoveWindow(int x, int y, int width, int height)
-{
-    // SetSize is called last in create, so it marks the end of creation
-    m_iFlags |= wxCC_IFLAG_CREATED;
-
-    wxControl::DoMoveWindow(x, y, width, height);
-}
-

 void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
 {
     if ( !IsCreated() )
 void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
 {
     if ( !IsCreated() )


@@ -1083,8 +1036,9 @@ void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
 // painting
 // ----------------------------------------------------------------------------
 
 // painting
 // ----------------------------------------------------------------------------
 

-// draw focus background on area in a way typical on platform
-void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
+#if (!defined(__WXMSW__)) || defined(__WXUNIVERSAL__)
+// prepare combo box background on area in a way typical on platform
+void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const

 {
     wxSize sz = GetClientSize();
     bool isEnabled;
 {
     wxSize sz = GetClientSize();
     bool isEnabled;


@@ -1118,8 +1072,14 @@ void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int fla
     wxRect selRect(rect);
     selRect.y += focusSpacingY;
     selRect.height -= (focusSpacingY*2);
     wxRect selRect(rect);
     selRect.y += focusSpacingY;
     selRect.height -= (focusSpacingY*2);

-    selRect.x += m_widthCustomPaint + focusSpacingX;
-    selRect.width -= m_widthCustomPaint + (focusSpacingX*2);
+
+    int wcp = 0;
+
+    if ( !(flags & wxCONTROL_ISSUBMENU) )
+        wcp += m_widthCustomPaint;
+
+    selRect.x += wcp + focusSpacingX;
+    selRect.width -= wcp + (focusSpacingX*2);

 
     wxColour bgCol;
 
 
     wxColour bgCol;
 


@@ -1147,7 +1107,19 @@ void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int fla
     dc.SetBrush( bgCol );
     dc.SetPen( bgCol );
     dc.DrawRectangle( selRect );
     dc.SetBrush( bgCol );
     dc.SetPen( bgCol );
     dc.DrawRectangle( selRect );

+
+    // Don't clip exactly to the selection rectangle so we can draw
+    // to the non-selected area in front of it.
+    wxRect clipRect(rect.x,rect.y,
+                    (selRect.x+selRect.width)-rect.x,rect.height);
+    dc.SetClippingRegion(clipRect);
+}
+#else
+// Save the library size a bit for platforms that re-implement this.
+void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const
+{

 }
 }

+#endif

 
 void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
 {
 
 void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
 {


@@ -1277,8 +1249,11 @@ wxBitmap& wxComboCtrlBase::GetBufferBitmap( const wxSize& sz ) const
 
 void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
 {
 
 void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
 {

-    // Change event id and relay it forward
+    // Change event id, object and string before relaying it forward

     event.SetId(GetId());
     event.SetId(GetId());

+    wxString s = event.GetString();
+    event.SetEventObject(this);
+    event.SetString(s);

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -1380,6 +1355,15 @@ bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
     wxLongLong t = ::wxGetLocalTimeMillis();
     int evtType = event.GetEventType();
 
     wxLongLong t = ::wxGetLocalTimeMillis();
     int evtType = event.GetEventType();
 

+#if !USE_TRANSIENT_POPUP
+    if ( m_isPopupShown &&
+         ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
+    {
+        HidePopup();
+        return true;
+    }
+#endif
+

     //
     // Generate our own double-clicks
     // (to allow on-focus dc-event on double-clicks instead of triple-clicks)
     //
     // Generate our own double-clicks
     // (to allow on-focus dc-event on double-clicks instead of triple-clicks)


@@ -1476,23 +1460,68 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
         event.Skip();
 }
 
         event.Skip();
 }
 

-void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& )
+void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)

 {
 {

-    // First click is the first part of double-click
-    // Some platforms don't generate down-less mouse up-event
-    // (Windows does, GTK+2 doesn't), so that's why we have
-    // to do this.
-    m_timeLastMouseUp = ::wxGetLocalTimeMillis();
+    if ( IsPopupShown() )
+    {
+        // pass it to the popped up control
+        GetPopupControl()->GetControl()->AddPendingEvent(event);
+    }
+    else // no popup
+    {
+        int keycode = event.GetKeyCode();

 
 

-    if ( m_text )
+        if ( keycode == WXK_TAB )
+        {
+            wxNavigationKeyEvent evt;
+            evt.SetFlags(wxNavigationKeyEvent::FromTab|
+                         (!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
+                                             : wxNavigationKeyEvent::IsBackward));
+            evt.SetEventObject(this);
+            GetParent()->GetEventHandler()->AddPendingEvent(evt);
+            return;
+        }
+
+        if ( IsKeyPopupToggle(event) )
+        {
+            OnButtonClick();
+            return;
+        }
+
+        int comboStyle = GetWindowStyle();
+        wxComboPopup* popupInterface = GetPopupControl();
+
+        if ( !popupInterface )
+        {
+            event.Skip();
+            return;
+        }
+
+        if ( (comboStyle & wxCB_READONLY) ||
+             (keycode != WXK_RIGHT && keycode != WXK_LEFT) )
+        {
+            popupInterface->OnComboKeyEvent(event);
+        }
+        else
+            event.Skip();
+    }
+}
+
+void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
+{
+    if ( event.GetEventType() == wxEVT_SET_FOCUS )

     {
     {

-        m_text->SetFocus();
+        // First click is the first part of double-click
+        // Some platforms don't generate down-less mouse up-event
+        // (Windows does, GTK+2 doesn't), so that's why we have
+        // to do this.
+        m_timeLastMouseUp = ::wxGetLocalTimeMillis();
+
+        if ( m_text && m_text != ::wxWindow::FindFocus() )
+            m_text->SetFocus();

     }
     }

-    else
-        // no need to check for m_widthCustomPaint - that
-        // area never gets special handling when selected
-        // (in writable mode, that is)
-        Refresh();
+
+    Refresh();

 }
 
 void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 }
 
 void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))


@@ -1531,19 +1560,39 @@ void wxComboCtrlBase::CreatePopup()
     popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
 }
 
     popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
 }
 

-void wxComboCtrlBase::SetPopupControl( wxComboPopup* iface )
+// Destroy popup window and the child control
+void wxComboCtrlBase::DestroyPopup()

 {
 {

-    wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
+    HidePopup();
+
+    if ( m_popup )
+        m_popup->RemoveEventHandler(m_popupExtraHandler);
+
+    delete m_popupExtraHandler;

 
     delete m_popupInterface;
 
     delete m_popupInterface;

-    delete m_winPopup;
+
+    if ( m_winPopup )
+        m_winPopup->Destroy();
+
+    m_popupExtraHandler = (wxEvtHandler*) NULL;
+    m_popupInterface = (wxComboPopup*) NULL;
+    m_winPopup = (wxWindow*) NULL;
+    m_popup = (wxWindow*) NULL;
+}
+
+void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
+{
+    wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
+
+    DestroyPopup();

 
     iface->InitBase(this);
     iface->Init();
 
     m_popupInterface = iface;
 
 
     iface->InitBase(this);
     iface->Init();
 
     m_popupInterface = iface;
 

-    if ( !iface->LazyCreate() || m_winPopup )
+    if ( !iface->LazyCreate() )

     {
         CreatePopup();
     }
     {
         CreatePopup();
     }


@@ -1653,15 +1702,45 @@ void wxComboCtrlBase::ShowPopup()
     int popupX;
     int popupY = scrPos.y + ctrlSz.y;
 
     int popupX;
     int popupY = scrPos.y + ctrlSz.y;
 

+    // Default anchor is wxLEFT

     int anchorSide = m_anchorSide;
     if ( !anchorSide )
     int anchorSide = m_anchorSide;
     if ( !anchorSide )

-        anchorSide = m_btnSide;
+        anchorSide = wxLEFT;
+
+    int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
+    int leftX = scrPos.x - m_extLeft;
+    int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );

 
 

-    // Anchor popup to the side the dropbutton is on
+    // If there is not enough horizontal space, anchor on the other side.
+    // If there is no space even then, place the popup at x 0.

     if ( anchorSide == wxRIGHT )
     if ( anchorSide == wxRIGHT )

-        popupX = scrPos.x + ctrlSz.x + m_extRight- szp.x;
+    {
+        if ( rightX < 0 )
+        {
+            if ( (leftX+szp.x) < screenWidth )
+                anchorSide = wxLEFT;
+            else
+                anchorSide = 0;
+        }
+    }
+    else
+    {
+        if ( (leftX+szp.x) >= screenWidth )
+        {
+            if ( rightX >= 0 )
+                anchorSide = wxRIGHT;
+            else
+                anchorSide = 0;
+        }
+    }
+
+    // Select x coordinate according to the anchor side
+    if ( anchorSide == wxRIGHT )
+        popupX = rightX;
+    else if ( anchorSide == wxLEFT )
+        popupX = leftX;

     else
     else

-        popupX = scrPos.x - m_extLeft;
+        popupX = 0;

 
     if ( spaceBelow < szp.y )
     {
 
     if ( spaceBelow < szp.y )
     {


@@ -1791,7 +1870,7 @@ void wxComboCtrlBase::HidePopup()
 // ----------------------------------------------------------------------------
 
 void wxComboCtrlBase::SetButtonPosition( int width, int height,
 // ----------------------------------------------------------------------------
 
 void wxComboCtrlBase::SetButtonPosition( int width, int height,

-                                            int side, int spacingX )
+                                         int side, int spacingX )

 {
     m_btnWid = width;
     m_btnHei = height;
 {
     m_btnWid = width;
     m_btnHei = height;


@@ -1801,6 +1880,25 @@ void wxComboCtrlBase::SetButtonPosition( int width, int height,
     RecalcAndRefresh();
 }
 
     RecalcAndRefresh();
 }
 

+wxSize wxComboCtrlBase::GetButtonSize()
+{
+    if ( m_btnSize.x > 0 )
+        return m_btnSize;
+
+    wxSize retSize(m_btnWid,m_btnHei);
+
+    // Need to call CalculateAreas now if button size is
+    // is not explicitly specified.
+    if ( retSize.x <= 0 || retSize.y <= 0)
+    {
+        OnResize();
+
+        retSize = m_btnSize;
+    }
+
+    return retSize;
+}
+

 void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
                                            bool blankButtonBg,
                                            const wxBitmap& bmpPressed,
 void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
                                            bool blankButtonBg,
                                            const wxBitmap& bmpPressed,