remove redundant GdkBitmap representation from wxBitmap

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 09bd64340ec97898ad7d6a1df4aae6f30d0bf16f..503005d9f65377ae0f7c84c658999358b1347e5e 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combocmn.cpp
-// Purpose:     wxComboControlBase
+// Name:        src/common/combocmn.cpp
+// Purpose:     wxComboCtrlBase

 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006


@@ -23,20 +23,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_COMBOCONTROL
+#if wxUSE_COMBOCTRL
+
+#include "wx/combobox.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/log.h"
     #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 +139,7 @@
 class wxComboFrameEventHandler : public wxEvtHandler
 {
 public:
 class wxComboFrameEventHandler : public wxEvtHandler
 {
 public:

-    wxComboFrameEventHandler( wxComboControlBase* pCb );
+    wxComboFrameEventHandler( wxComboCtrlBase* pCb );

     ~wxComboFrameEventHandler();
 
     void OnPopup();
     ~wxComboFrameEventHandler();
 
     void OnPopup();


@@ -154,7 +154,7 @@ public:
 
 protected:
     wxWindow*                       m_focusStart;
 
 protected:
     wxWindow*                       m_focusStart;

-    wxComboControlBase*     m_combo;
+    wxComboCtrlBase*     m_combo;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -172,7 +172,7 @@ BEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
     EVT_CLOSE(wxComboFrameEventHandler::OnClose)
 END_EVENT_TABLE()
 
     EVT_CLOSE(wxComboFrameEventHandler::OnClose)
 END_EVENT_TABLE()
 

-wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboControlBase* combo )
+wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo )

     : wxEvtHandler()
 {
     m_combo = combo;
     : wxEvtHandler()
 {
     m_combo = combo;


@@ -250,14 +250,14 @@ void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
 
 // ----------------------------------------------------------------------------
 // wxComboPopupWindow is wxPopupWindow customized for
 
 // ----------------------------------------------------------------------------
 // wxComboPopupWindow is wxPopupWindow customized for

-// wxComboControl.
+// wxComboCtrl.

 // ----------------------------------------------------------------------------
 
 class wxComboPopupWindow : public wxComboPopupWindowBase
 {
 public:
 
 // ----------------------------------------------------------------------------
 
 class wxComboPopupWindow : public wxComboPopupWindowBase
 {
 public:
 

-    wxComboPopupWindow( wxComboControlBase *parent, int style = wxBORDER_NONE );
+    wxComboPopupWindow( wxComboCtrlBase *parent, int style = wxBORDER_NONE );

 
 #if USE_TRANSIENT_POPUP
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 
 #if USE_TRANSIENT_POPUP
     virtual bool ProcessLeftDown(wxMouseEvent& event);


@@ -291,7 +291,7 @@ BEGIN_EVENT_TABLE(wxComboPopupWindow, wxComboPopupWindowBase)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-wxComboPopupWindow::wxComboPopupWindow( wxComboControlBase *parent,
+wxComboPopupWindow::wxComboPopupWindow( wxComboCtrlBase *parent,

                                         int style )
 #if wxUSE_POPUPWIN
                                        : wxComboPopupWindowBase(parent,style)
                                         int style )
 #if wxUSE_POPUPWIN
                                        : wxComboPopupWindowBase(parent,style)


@@ -327,9 +327,9 @@ void wxComboPopupWindow::OnActivate( wxActivateEvent& event )
     if ( !event.GetActive() )
     {
         // Tell combo control that we are dismissed.
     if ( !event.GetActive() )
     {
         // Tell combo control that we are dismissed.

-        wxComboControl* combo = (wxComboControl*) GetParent();
+        wxComboCtrl* combo = (wxComboCtrl*) GetParent();

         wxASSERT( combo );
         wxASSERT( combo );

-        wxASSERT( combo->IsKindOf(CLASSINFO(wxComboControl)) );
+        wxASSERT( combo->IsKindOf(CLASSINFO(wxComboCtrl)) );

 
         combo->HidePopup();
 
 
         combo->HidePopup();
 


@@ -349,9 +349,9 @@ bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event )
 // First thing that happens when a transient popup closes is that this method gets called.
 void wxComboPopupWindow::OnDismiss()
 {
 // First thing that happens when a transient popup closes is that this method gets called.
 void wxComboPopupWindow::OnDismiss()
 {

-    wxComboControlBase* combo = (wxComboControlBase*) GetParent();
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboControlBase)),
-                  wxT("parent might not be wxComboControl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
+    wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
+    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
+                  wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );

 
     combo->OnPopupDismiss();
 }
 
     combo->OnPopupDismiss();
 }


@@ -381,7 +381,7 @@ wxSize wxComboPopup::GetAdjustedSize( int minWidth,
     return wxSize(minWidth,prefHeight);
 }
 
     return wxSize(minWidth,prefHeight);
 }
 

-void wxComboPopup::DefaultPaintComboControl( wxComboControlBase* combo,
+void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,

                                              wxDC& dc, const wxRect& rect )
 {
     if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
                                              wxDC& dc, const wxRect& rect )
 {
     if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl


@@ -434,7 +434,7 @@ class wxComboBoxExtraInputHandler : public wxEvtHandler
 {
 public:
 
 {
 public:
 

-    wxComboBoxExtraInputHandler( wxComboControlBase* combo )
+    wxComboBoxExtraInputHandler( wxComboCtrlBase* combo )

         : wxEvtHandler()
     {
         m_combo = combo;
         : wxEvtHandler()
     {
         m_combo = combo;


@@ -444,7 +444,7 @@ public:
     void OnFocus(wxFocusEvent& event);
 
 protected:
     void OnFocus(wxFocusEvent& event);
 
 protected:

-    wxComboControlBase*   m_combo;
+    wxComboCtrlBase*   m_combo;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -547,7 +547,7 @@ class wxComboPopupExtraEventHandler : public wxEvtHandler
 {
 public:
 
 {
 public:
 

-    wxComboPopupExtraEventHandler( wxComboControlBase* combo )
+    wxComboPopupExtraEventHandler( wxComboCtrlBase* combo )

         : wxEvtHandler()
     {
         m_combo = combo;
         : wxEvtHandler()
     {
         m_combo = combo;


@@ -557,14 +557,14 @@ public:
 
     void OnMouseEvent( wxMouseEvent& event );
 
 
     void OnMouseEvent( wxMouseEvent& event );
 

-    // Called from wxComboControlBase::OnPopupDismiss
+    // Called from wxComboCtrlBase::OnPopupDismiss

     void OnPopupDismiss()
     {
         m_beenInside = false;
     }
 
 protected:
     void OnPopupDismiss()
     {
         m_beenInside = false;
     }
 
 protected:

-    wxComboControlBase*     m_combo;
+    wxComboCtrlBase*     m_combo;

 
     bool                    m_beenInside;
 
 
     bool                    m_beenInside;
 


@@ -635,27 +635,27 @@ void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event )
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxComboControlBase
+// wxComboCtrlBase

 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 
 

-BEGIN_EVENT_TABLE(wxComboControlBase, wxControl)
-    EVT_TEXT(wxID_ANY,wxComboControlBase::OnTextCtrlEvent)
-    EVT_SIZE(wxComboControlBase::OnSizeEvent)
-    EVT_SET_FOCUS(wxComboControlBase::OnFocusEvent)
-    EVT_KILL_FOCUS(wxComboControlBase::OnFocusEvent)
-    //EVT_BUTTON(wxID_ANY,wxComboControlBase::OnButtonClickEvent)
-    EVT_TEXT_ENTER(wxID_ANY,wxComboControlBase::OnTextCtrlEvent)
-    EVT_SYS_COLOUR_CHANGED(wxComboControlBase::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
+    EVT_TEXT(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
+    EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
+    EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
+    EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
+    //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
+    EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
+    EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-IMPLEMENT_ABSTRACT_CLASS(wxComboControlBase, wxControl)
+IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)

 
 // Have global double buffer - should be enough for multiple combos
 static wxBitmap* gs_doubleBuffer = (wxBitmap*) NULL;
 
 
 // Have global double buffer - should be enough for multiple combos
 static wxBitmap* gs_doubleBuffer = (wxBitmap*) NULL;
 

-void wxComboControlBase::Init()
+void wxComboCtrlBase::Init()

 {
     m_winPopup = (wxWindow *)NULL;
     m_popup = (wxWindow *)NULL;
 {
     m_winPopup = (wxWindow *)NULL;
     m_popup = (wxWindow *)NULL;


@@ -693,14 +693,14 @@ void wxComboControlBase::Init()
     m_timeCanAcceptClick = 0;
 }
 
     m_timeCanAcceptClick = 0;
 }
 

-bool wxComboControlBase::Create(wxWindow *parent,
-                                wxWindowID id,
-                                const wxString& value,
-                                const wxPoint& pos,
-                                const wxSize& size,
-                                long style,
-                                const wxValidator& validator,
-                                const wxString& name)
+bool wxComboCtrlBase::Create(wxWindow *parent,
+                             wxWindowID id,
+                             const wxString& value,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxValidator& validator,
+                             const wxString& name)

 {
     if ( !wxControl::Create(parent,
                             id,
 {
     if ( !wxControl::Create(parent,
                             id,


@@ -717,10 +717,20 @@ bool wxComboControlBase::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 wxComboControlBase::InstallInputHandlers( bool alsoTextCtrl )
+void wxComboCtrlBase::InstallInputHandlers( bool alsoTextCtrl )

 {
     if ( m_text && alsoTextCtrl )
     {
 {
     if ( m_text && alsoTextCtrl )
     {


@@ -733,12 +743,12 @@ void wxComboControlBase::InstallInputHandlers( bool alsoTextCtrl )
     m_extraEvtHandler = inputHandler;
 }
 
     m_extraEvtHandler = inputHandler;
 }
 

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

 {
     if ( !(m_windowStyle & wxCB_READONLY) )
     {
         m_text = new wxTextCtrl(this,
 {
     if ( !(m_windowStyle & wxCB_READONLY) )
     {
         m_text = new wxTextCtrl(this,

-                                12345,
+                                wxID_ANY,

                                 m_valueString,
                                 wxDefaultPosition,
                                 wxDefaultSize,
                                 m_valueString,
                                 wxDefaultPosition,
                                 wxDefaultSize,


@@ -757,12 +767,12 @@ void wxComboControlBase::CreateTextCtrl( int extraStyle, const wxValidator& vali
     }
 }
 
     }
 }
 

-void wxComboControlBase::OnThemeChange()
+void wxComboCtrlBase::OnThemeChange()

 {
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 }
 
 {
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 }
 

-wxComboControlBase::~wxComboControlBase()
+wxComboCtrlBase::~wxComboCtrlBase()

 {
     if ( HasCapture() )
         ReleaseMouse();
 {
     if ( HasCapture() )
         ReleaseMouse();


@@ -775,15 +785,7 @@ wxComboControlBase::~wxComboControlBase()
     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;
+    DestroyPopup();

 
     RemoveEventHandler(m_extraEvtHandler);
 
 
     RemoveEventHandler(m_extraEvtHandler);
 


@@ -800,24 +802,25 @@ wxComboControlBase::~wxComboControlBase()
 // ----------------------------------------------------------------------------
 
 // Recalculates button and textctrl areas
 // ----------------------------------------------------------------------------
 
 // Recalculates button and textctrl areas

-void wxComboControlBase::CalculateAreas( int btnWidth )
+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
 
     int btnBorder; // border for button only
 

-    if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) || m_blankButtonBg ) &&
-         m_btnSpacingX == 0 && m_btnWid == 0 && m_btnHei == 0 &&
-         (!m_bmpNormal.Ok() || m_blankButtonBg) )
+    // check if button should really be outside the border: we'll do it it if
+    // its platform default or bitmap+pushbutton background is used, but not if
+    // there is vertical size adjustment or horizontal spacing.
+    if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
+                (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
+         m_btnSpacingX == 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;
     }


@@ -836,15 +839,31 @@ void wxComboControlBase::CalculateAreas( int btnWidth )
     if ( butWidth <= 0 )
         return;
 
     if ( butWidth <= 0 )
         return;
 

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

     // Adjust button width
     if ( m_btnWid < 0 )
         butWidth += m_btnWid;
     else if ( m_btnWid > 0 )
         butWidth = m_btnWid;
     // Adjust button width
     if ( m_btnWid < 0 )
         butWidth += m_btnWid;
     else if ( m_btnWid > 0 )
         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
     if ( m_btnHei < 0 )
 
     // Adjust button height
     if ( m_btnHei < 0 )


@@ -877,7 +896,7 @@ void wxComboControlBase::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;
         }
     }


@@ -906,7 +925,7 @@ void wxComboControlBase::CalculateAreas( int btnWidth )
 */
 }
 
 */
 }
 

-void wxComboControlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
+void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )

 {
     if ( !m_text )
         return;
 {
     if ( !m_text )
         return;


@@ -948,7 +967,7 @@ void wxComboControlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdj
     }
 }
 
     }
 }
 

-wxSize wxComboControlBase::DoGetBestSize() const
+wxSize wxComboCtrlBase::DoGetBestSize() const

 {
     wxSize sizeText(150,0);
 
 {
     wxSize sizeText(150,0);
 


@@ -995,20 +1014,12 @@ wxSize wxComboControlBase::DoGetBestSize() const
     return ret;
 }
 
     return ret;
 }
 

-void wxComboControlBase::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 wxComboControlBase::OnSizeEvent( wxSizeEvent& event )
+void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )

 {
     if ( !IsCreated() )
         return;
 
 {
     if ( !IsCreated() )
         return;
 

-    // defined by actual wxComboControls
+    // defined by actual wxComboCtrls

     OnResize();
 
     event.Skip();
     OnResize();
 
     event.Skip();


@@ -1018,7 +1029,7 @@ void wxComboControlBase::OnSizeEvent( wxSizeEvent& event )
 // standard operations
 // ----------------------------------------------------------------------------
 
 // standard operations
 // ----------------------------------------------------------------------------
 

-bool wxComboControlBase::Enable(bool enable)
+bool wxComboCtrlBase::Enable(bool enable)

 {
     if ( !wxControl::Enable(enable) )
         return false;
 {
     if ( !wxControl::Enable(enable) )
         return false;


@@ -1031,7 +1042,7 @@ bool wxComboControlBase::Enable(bool enable)
     return true;
 }
 
     return true;
 }
 

-bool wxComboControlBase::Show(bool show)
+bool wxComboCtrlBase::Show(bool show)

 {
     if ( !wxControl::Show(show) )
         return false;
 {
     if ( !wxControl::Show(show) )
         return false;


@@ -1045,7 +1056,7 @@ bool wxComboControlBase::Show(bool show)
     return true;
 }
 
     return true;
 }
 

-bool wxComboControlBase::SetFont ( const wxFont& font )
+bool wxComboCtrlBase::SetFont ( const wxFont& font )

 {
     if ( !wxControl::SetFont(font) )
         return false;
 {
     if ( !wxControl::SetFont(font) )
         return false;


@@ -1057,7 +1068,7 @@ bool wxComboControlBase::SetFont ( const wxFont& font )
 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS

-void wxComboControlBase::DoSetToolTip(wxToolTip *tooltip)
+void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)

 {
     wxControl::DoSetToolTip(tooltip);
 
 {
     wxControl::DoSetToolTip(tooltip);
 


@@ -1081,7 +1092,7 @@ void wxComboControlBase::DoSetToolTip(wxToolTip *tooltip)
 // ----------------------------------------------------------------------------
 
 // draw focus background on area in a way typical on platform
 // ----------------------------------------------------------------------------
 
 // draw focus background on area in a way typical on platform

-void wxComboControlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags )
+void wxComboCtrlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int flags ) const

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


@@ -1146,7 +1157,7 @@ void wxComboControlBase::DrawFocusBackground( wxDC& dc, const wxRect& rect, int
     dc.DrawRectangle( selRect );
 }
 
     dc.DrawRectangle( selRect );
 }
 

-void wxComboControlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
+void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )

 {
     int drawState = m_btnState;
 
 {
     int drawState = m_btnState;
 


@@ -1174,9 +1185,19 @@ void wxComboControlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg
     if ( !m_bmpNormal.Ok() )
     {
         // Need to clear button background even if m_btn is present
     if ( !m_bmpNormal.Ok() )
     {
         // Need to clear button background even if m_btn is present

-        // (assume non-button background was cleared just before this call so brushes are good)

         if ( paintBg )
         if ( paintBg )

+        {
+            wxColour bgCol;
+
+            if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
+                bgCol = GetParent()->GetBackgroundColour();
+            else
+                bgCol = GetBackgroundColour();
+
+            dc.SetBrush(bgCol);
+            dc.SetPen(bgCol);

             dc.DrawRectangle(rect);
             dc.DrawRectangle(rect);

+        }

 
         // Draw standard button
         wxRendererNative::Get().DrawComboBoxDropButton(this,
 
         // Draw standard button
         wxRendererNative::Get().DrawComboBoxDropButton(this,


@@ -1235,7 +1256,7 @@ void wxComboControlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg
     }
 }
 
     }
 }
 

-void wxComboControlBase::RecalcAndRefresh()
+void wxComboCtrlBase::RecalcAndRefresh()

 {
     if ( IsCreated() )
     {
 {
     if ( IsCreated() )
     {


@@ -1245,7 +1266,7 @@ void wxComboControlBase::RecalcAndRefresh()
     }
 }
 
     }
 }
 

-wxBitmap& wxComboControlBase::GetBufferBitmap( const wxSize& sz ) const
+wxBitmap& wxComboCtrlBase::GetBufferBitmap( const wxSize& sz ) const

 {
     // If size is larger, recalculate double buffer bitmap
     if ( !gs_doubleBuffer ||
 {
     // If size is larger, recalculate double buffer bitmap
     if ( !gs_doubleBuffer ||


@@ -1262,7 +1283,7 @@ wxBitmap& wxComboControlBase::GetBufferBitmap( const wxSize& sz ) const
 // miscellaneous event handlers
 // ----------------------------------------------------------------------------
 
 // miscellaneous event handlers
 // ----------------------------------------------------------------------------
 

-void wxComboControlBase::OnTextCtrlEvent(wxCommandEvent& event)
+void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)

 {
     // Change event id and relay it forward
     event.SetId(GetId());
 {
     // Change event id and relay it forward
     event.SetId(GetId());


@@ -1270,7 +1291,7 @@ void wxComboControlBase::OnTextCtrlEvent(wxCommandEvent& event)
 }
 
 // call if cursor is on button area or mouse is captured for the button
 }
 
 // call if cursor is on button area or mouse is captured for the button

-bool wxComboControlBase::HandleButtonMouseEvent( wxMouseEvent& event,
+bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,

                                                  int flags )
 {
     int type = event.GetEventType();
                                                  int flags )
 {
     int type = event.GetEventType();


@@ -1360,8 +1381,8 @@ bool wxComboControlBase::HandleButtonMouseEvent( wxMouseEvent& event,
 
 // Conversion to double-clicks and some basic filtering
 // returns true if event was consumed or filtered
 
 // Conversion to double-clicks and some basic filtering
 // returns true if event was consumed or filtered

-//bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event, bool isOnButtonArea )
-bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event,
+//bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event, bool isOnButtonArea )
+bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,

                                                int flags )
 {
     wxLongLong t = ::wxGetLocalTimeMillis();
                                                int flags )
 {
     wxLongLong t = ::wxGetLocalTimeMillis();


@@ -1419,7 +1440,7 @@ bool wxComboControlBase::PreprocessMouseEvent( wxMouseEvent& event,
     return false;
 }
 
     return false;
 }
 

-void wxComboControlBase::HandleNormalMouseEvent( wxMouseEvent& event )
+void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )

 {
     int evtType = event.GetEventType();
 
 {
     int evtType = event.GetEventType();
 


@@ -1463,7 +1484,7 @@ void wxComboControlBase::HandleNormalMouseEvent( wxMouseEvent& event )
         event.Skip();
 }
 
         event.Skip();
 }
 

-void wxComboControlBase::OnFocusEvent( wxFocusEvent& )
+void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& )

 {
     // First click is the first part of double-click
     // Some platforms don't generate down-less mouse up-event
 {
     // First click is the first part of double-click
     // Some platforms don't generate down-less mouse up-event


@@ -1482,7 +1503,7 @@ void wxComboControlBase::OnFocusEvent( wxFocusEvent& )
         Refresh();
 }
 
         Refresh();
 }
 

-void wxComboControlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))

 {
     OnThemeChange();
     // indentation may also have changed
 {
     OnThemeChange();
     // indentation may also have changed


@@ -1496,7 +1517,7 @@ void wxComboControlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(ev
 // ----------------------------------------------------------------------------
 
 // Create popup window and the child control
 // ----------------------------------------------------------------------------
 
 // Create popup window and the child control

-void wxComboControlBase::CreatePopup()
+void wxComboCtrlBase::CreatePopup()

 {
     wxComboPopup* popupInterface = m_popupInterface;
     wxWindow* popup;
 {
     wxComboPopup* popupInterface = m_popupInterface;
     wxWindow* popup;


@@ -1518,19 +1539,38 @@ void wxComboControlBase::CreatePopup()
     popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
 }
 
     popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
 }
 

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

 {
 {

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

 
     delete m_popupInterface;
 
     delete m_popupInterface;

-    delete m_winPopup;
+
+    if ( m_winPopup )
+        m_winPopup->Destroy();
+
+    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();
     }


@@ -1548,20 +1588,20 @@ void wxComboControlBase::SetPopupControl( wxComboPopup* iface )
 }
 
 // Ensures there is atleast the default popup
 }
 
 // Ensures there is atleast the default popup

-void wxComboControlBase::EnsurePopupControl()
+void wxComboCtrlBase::EnsurePopupControl()

 {
     if ( !m_popupInterface )
         SetPopupControl(NULL);
 }
 
 {
     if ( !m_popupInterface )
         SetPopupControl(NULL);
 }
 

-void wxComboControlBase::OnButtonClick()
+void wxComboCtrlBase::OnButtonClick()

 {
     // Derived classes can override this method for totally custom
     // popup action
     ShowPopup();
 }
 
 {
     // Derived classes can override this method for totally custom
     // popup action
     ShowPopup();
 }
 

-void wxComboControlBase::ShowPopup()
+void wxComboCtrlBase::ShowPopup()

 {
     EnsurePopupControl();
     wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );
 {
     EnsurePopupControl();
     wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );


@@ -1640,15 +1680,45 @@ void wxComboControlBase::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 );
+
+    // 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 ( 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;
+        }
+    }

 
 

-    // Anchor popup to the side the dropbutton is on
+    // Select x coordinate according to the anchor side

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

-        popupX = scrPos.x + ctrlSz.x + m_extRight- szp.x;
+        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 )
     {


@@ -1704,7 +1774,7 @@ void wxComboControlBase::ShowPopup()
 
 }
 
 
 }
 

-void wxComboControlBase::OnPopupDismiss()
+void wxComboCtrlBase::OnPopupDismiss()

 {
     // Just in case, avoid double dismiss
     if ( !m_isPopupShown )
 {
     // Just in case, avoid double dismiss
     if ( !m_isPopupShown )


@@ -1754,7 +1824,7 @@ void wxComboControlBase::OnPopupDismiss()
 
 }
 
 
 }
 

-void wxComboControlBase::HidePopup()
+void wxComboCtrlBase::HidePopup()

 {
     // Should be able to call this without popup interface
     //wxCHECK_RET( m_popupInterface, _T("no popup interface") );
 {
     // Should be able to call this without popup interface
     //wxCHECK_RET( m_popupInterface, _T("no popup interface") );


@@ -1777,7 +1847,7 @@ void wxComboControlBase::HidePopup()
 // customization methods
 // ----------------------------------------------------------------------------
 
 // customization methods
 // ----------------------------------------------------------------------------
 

-void wxComboControlBase::SetButtonPosition( int width, int height,
+void wxComboCtrlBase::SetButtonPosition( int width, int height,

                                             int side, int spacingX )
 {
     m_btnWid = width;
                                             int side, int spacingX )
 {
     m_btnWid = width;


@@ -1788,7 +1858,7 @@ void wxComboControlBase::SetButtonPosition( int width, int height,
     RecalcAndRefresh();
 }
 
     RecalcAndRefresh();
 }
 

-void wxComboControlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
+void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,

                                            bool blankButtonBg,
                                            const wxBitmap& bmpPressed,
                                            const wxBitmap& bmpHover,
                                            bool blankButtonBg,
                                            const wxBitmap& bmpPressed,
                                            const wxBitmap& bmpHover,


@@ -1815,7 +1885,7 @@ void wxComboControlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
     RecalcAndRefresh();
 }
 
     RecalcAndRefresh();
 }
 

-void wxComboControlBase::SetCustomPaintWidth( int width )
+void wxComboCtrlBase::SetCustomPaintWidth( int width )

 {
     if ( m_text )
     {
 {
     if ( m_text )
     {


@@ -1832,7 +1902,7 @@ void wxComboControlBase::SetCustomPaintWidth( int width )
     RecalcAndRefresh();
 }
 
     RecalcAndRefresh();
 }
 

-void wxComboControlBase::SetTextIndent( int indent )
+void wxComboCtrlBase::SetTextIndent( int indent )

 {
     if ( indent < 0 )
     {
 {
     if ( indent < 0 )
     {


@@ -1848,7 +1918,7 @@ void wxComboControlBase::SetTextIndent( int indent )
     RecalcAndRefresh();
 }
 
     RecalcAndRefresh();
 }
 

-wxCoord wxComboControlBase::GetNativeTextIndent() const
+wxCoord wxComboCtrlBase::GetNativeTextIndent() const

 {
     return DEFAULT_TEXT_INDENT;
 }
 {
     return DEFAULT_TEXT_INDENT;
 }


@@ -1857,14 +1927,14 @@ wxCoord wxComboControlBase::GetNativeTextIndent() const
 // methods forwarded to wxTextCtrl
 // ----------------------------------------------------------------------------
 
 // methods forwarded to wxTextCtrl
 // ----------------------------------------------------------------------------
 

-wxString wxComboControlBase::GetValue() const
+wxString wxComboCtrlBase::GetValue() const

 {
     if ( m_text )
         return m_text->GetValue();
     return m_valueString;
 }
 
 {
     if ( m_text )
         return m_text->GetValue();
     return m_valueString;
 }
 

-void wxComboControlBase::SetValue(const wxString& value)
+void wxComboCtrlBase::SetValue(const wxString& value)

 {
     if ( m_text )
     {
 {
     if ( m_text )
     {


@@ -1886,7 +1956,7 @@ void wxComboControlBase::SetValue(const wxString& value)
 }
 
 // In this SetValue variant wxComboPopup::SetStringValue is not called
 }
 
 // In this SetValue variant wxComboPopup::SetStringValue is not called

-void wxComboControlBase::SetText(const wxString& value)
+void wxComboCtrlBase::SetText(const wxString& value)

 {
     // Unlike in SetValue(), this must be called here or
     // the behaviour will no be consistent in readonlys.
 {
     // Unlike in SetValue(), this must be called here or
     // the behaviour will no be consistent in readonlys.


@@ -1897,37 +1967,37 @@ void wxComboControlBase::SetText(const wxString& value)
     Refresh();
 }
 
     Refresh();
 }
 

-void wxComboControlBase::Copy()
+void wxComboCtrlBase::Copy()

 {
     if ( m_text )
         m_text->Copy();
 }
 
 {
     if ( m_text )
         m_text->Copy();
 }
 

-void wxComboControlBase::Cut()
+void wxComboCtrlBase::Cut()

 {
     if ( m_text )
         m_text->Cut();
 }
 
 {
     if ( m_text )
         m_text->Cut();
 }
 

-void wxComboControlBase::Paste()
+void wxComboCtrlBase::Paste()

 {
     if ( m_text )
         m_text->Paste();
 }
 
 {
     if ( m_text )
         m_text->Paste();
 }
 

-void wxComboControlBase::SetInsertionPoint(long pos)
+void wxComboCtrlBase::SetInsertionPoint(long pos)

 {
     if ( m_text )
         m_text->SetInsertionPoint(pos);
 }
 
 {
     if ( m_text )
         m_text->SetInsertionPoint(pos);
 }
 

-void wxComboControlBase::SetInsertionPointEnd()
+void wxComboCtrlBase::SetInsertionPointEnd()

 {
     if ( m_text )
         m_text->SetInsertionPointEnd();
 }
 
 {
     if ( m_text )
         m_text->SetInsertionPointEnd();
 }
 

-long wxComboControlBase::GetInsertionPoint() const
+long wxComboCtrlBase::GetInsertionPoint() const

 {
     if ( m_text )
         return m_text->GetInsertionPoint();
 {
     if ( m_text )
         return m_text->GetInsertionPoint();


@@ -1935,7 +2005,7 @@ long wxComboControlBase::GetInsertionPoint() const
     return 0;
 }
 
     return 0;
 }
 

-long wxComboControlBase::GetLastPosition() const
+long wxComboCtrlBase::GetLastPosition() const

 {
     if ( m_text )
         return m_text->GetLastPosition();
 {
     if ( m_text )
         return m_text->GetLastPosition();


@@ -1943,28 +2013,28 @@ long wxComboControlBase::GetLastPosition() const
     return 0;
 }
 
     return 0;
 }
 

-void wxComboControlBase::Replace(long from, long to, const wxString& value)
+void wxComboCtrlBase::Replace(long from, long to, const wxString& value)

 {
     if ( m_text )
         m_text->Replace(from, to, value);
 }
 
 {
     if ( m_text )
         m_text->Replace(from, to, value);
 }
 

-void wxComboControlBase::Remove(long from, long to)
+void wxComboCtrlBase::Remove(long from, long to)

 {
     if ( m_text )
         m_text->Remove(from, to);
 }
 
 {
     if ( m_text )
         m_text->Remove(from, to);
 }
 

-void wxComboControlBase::SetSelection(long from, long to)
+void wxComboCtrlBase::SetSelection(long from, long to)

 {
     if ( m_text )
         m_text->SetSelection(from, to);
 }
 
 {
     if ( m_text )
         m_text->SetSelection(from, to);
 }
 

-void wxComboControlBase::Undo()
+void wxComboCtrlBase::Undo()

 {
     if ( m_text )
         m_text->Undo();
 }
 
 {
     if ( m_text )
         m_text->Undo();
 }
 

-#endif // wxUSE_COMBOCONTROL
+#endif // wxUSE_COMBOCTRL