Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 5f79ec30ef16f73b6445600ded9c6aec52faecd8..d76166d771876eeced23451be3b04943d55ba6c9 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006

-// RCS-ID:      $Id$

 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -23,26 +22,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/combo.h"
+

 #if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
 #if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";

-#endif
-
-#if wxUSE_COMBOCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/dcclient.h"
-    #include "wx/settings.h"
-    #include "wx/timer.h"
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/tooltip.h"
-
-#include "wx/combo.h"
-

 
 // ----------------------------------------------------------------------------
 // XTI
 
 // ----------------------------------------------------------------------------
 // XTI


@@ -87,8 +71,8 @@ wxEND_FLAGS( wxComboBoxStyle )
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)

-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+wxEVENT_PROPERTY( Select, wxEVT_COMBOBOX, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_TEXT_ENTER, wxCommandEvent )

 
 // TODO DELEGATES
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
 
 // TODO DELEGATES
 wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \


@@ -110,6 +94,21 @@ wxEMPTY_HANDLERS_TABLE(wxComboBox)
 wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
                 wxString, Value, wxPoint, Position, wxSize, Size )
 
 wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
                 wxString, Value, wxPoint, Position, wxSize, Size )
 

+#endif // wxUSE_COMBOBOX
+
+#if wxUSE_COMBOCTRL
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/timer.h"
+    #include "wx/textctrl.h"
+#endif
+
+#include "wx/tooltip.h"
+

 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 


@@ -389,7 +388,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
     wxWindow* popup = m_combo->GetPopupControl()->GetControl();
     wxWindow* winpopup = m_combo->GetPopupWindow();
 
     wxWindow* popup = m_combo->GetPopupControl()->GetControl();
     wxWindow* winpopup = m_combo->GetPopupWindow();
 

-    if (
+    if ( !winFocused || (

          winFocused != m_focusStart &&
          winFocused != popup &&
          winFocused->GetParent() != popup &&
          winFocused != m_focusStart &&
          winFocused != popup &&
          winFocused->GetParent() != popup &&


@@ -398,6 +397,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
          winFocused != m_combo &&
          winFocused != m_combo->GetButton() // GTK (atleast) requires this
         )
          winFocused != m_combo &&
          winFocused != m_combo->GetButton() // GTK (atleast) requires this
         )

+       )

     {
         m_combo->HidePopup(true);
     }
     {
         m_combo->HidePopup(true);
     }


@@ -489,9 +489,8 @@ bool wxComboPopupWindow::Show( bool show )
 
     m_inShow++;
 
 
     m_inShow++;
 

-    wxASSERT( IsKindOf(CLASSINFO(wxPopupTransientWindow)) );
-
-    wxPopupTransientWindow* ptw = (wxPopupTransientWindow*) this;
+    wxPopupTransientWindow* const
+        ptw = static_cast<wxPopupTransientWindow*>(this);

 
     if ( show != ptw->IsShown() )
     {
 
     if ( show != ptw->IsShown() )
     {


@@ -518,7 +517,7 @@ bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
 void wxComboPopupWindow::OnDismiss()
 {
     wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
 void wxComboPopupWindow::OnDismiss()
 {
     wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();

-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
+    wxASSERT_MSG( wxDynamicCast(combo, wxComboCtrlBase),

                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 
     combo->OnPopupDismiss(true);
                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 
     combo->OnPopupDismiss(true);


@@ -766,7 +765,7 @@ void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
         if ( m_combo->GetTextCtrl() )
             m_combo->GetTextCtrl()->SelectAll();
         else
         if ( m_combo->GetTextCtrl() )
             m_combo->GetTextCtrl()->SelectAll();
         else

-            m_combo->SetSelection(-1,-1);
+            m_combo->SelectAll();

     }
 
     // Send focus indication to parent.
     }
 
     // Send focus indication to parent.


@@ -960,7 +959,6 @@ public:
 
 
 BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
 
 
 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_SIZE(wxComboCtrlBase::OnSizeEvent)
     EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
     EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)


@@ -968,7 +966,6 @@ BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
     //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
     EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
     EVT_CHAR(wxComboCtrlBase::OnCharEvent)
     //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
     EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
     EVT_CHAR(wxComboCtrlBase::OnCharEvent)

-    EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)

     EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
 END_EVENT_TABLE()
 


@@ -1046,10 +1043,11 @@ bool wxComboCtrlBase::Create(wxWindow *parent,
     m_iFlags |= wxCC_IFLAG_CREATED;
 
     // If x and y indicate valid size, wxSizeEvent won't be
     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.
+    // emitted automatically, so we need to add artificial one.

     if ( size.x > 0 && size.y > 0 )
     {
         wxSizeEvent evt(size,GetId());
     if ( size.x > 0 && size.y > 0 )
     {
         wxSizeEvent evt(size,GetId());

+        evt.SetEventObject(this);

         GetEventHandler()->AddPendingEvent(evt);
     }
 
         GetEventHandler()->AddPendingEvent(evt);
     }
 


@@ -1094,6 +1092,16 @@ wxComboCtrlBase::CreateTextCtrl(int style)
         m_text->Create(this, wxID_ANY, m_valueString,
                        wxDefaultPosition, wxSize(10,-1),
                        style);
         m_text->Create(this, wxID_ANY, m_valueString,
                        wxDefaultPosition, wxSize(10,-1),
                        style);

+
+        // Connecting the events is currently the most reliable way
+        wxWindowID id = m_text->GetId();
+        m_text->Connect(id, wxEVT_TEXT,
+                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
+                        NULL, this);
+        m_text->Connect(id, wxEVT_TEXT_ENTER,
+                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
+                        NULL, this);
+

         m_text->SetHint(m_hintText);
     }
 }
         m_text->SetHint(m_hintText);
     }
 }


@@ -1163,7 +1171,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
     // 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) ||
     // 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_bmpNormal.IsOk() && m_blankButtonBg) ) &&

          m_btnSpacingX == 0 &&
          m_btnHei <= 0 )
     {
          m_btnSpacingX == 0 &&
          m_btnHei <= 0 )
     {


@@ -1171,7 +1179,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
         btnBorder = 0;
     }
     else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) &&
         btnBorder = 0;
     }
     else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) &&

-              m_btnSpacingX == 0 && !m_bmpNormal.Ok() )
+              m_btnSpacingX == 0 && !m_bmpNormal.IsOk() )

     {
         m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
         btnBorder = 0;
     {
         m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
         btnBorder = 0;


@@ -1228,7 +1236,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
     //   It is larger
     //   OR
     //   button width is set to default and blank button bg is not drawn
     //   It is larger
     //   OR
     //   button width is set to default and blank button bg is not drawn

-    if ( m_bmpNormal.Ok() )
+    if ( m_bmpNormal.IsOk() )

     {
         int bmpReqWidth = m_bmpNormal.GetWidth();
         int bmpReqHeight = m_bmpNormal.GetHeight();
     {
         int bmpReqWidth = m_bmpNormal.GetWidth();
         int bmpReqHeight = m_bmpNormal.GetHeight();


@@ -1250,7 +1258,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
         {
             int newY = butHeight+(customBorder*2);
             SetClientSize(wxDefaultCoord,newY);
         {
             int newY = butHeight+(customBorder*2);
             SetClientSize(wxDefaultCoord,newY);

-            if ( m_bmpNormal.Ok() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
+            if ( m_bmpNormal.IsOk() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )

                 m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
             else
                 m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
                 m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
             else
                 m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;


@@ -1351,24 +1359,38 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
 
 wxSize wxComboCtrlBase::DoGetBestSize() const
 {
 
 wxSize wxComboCtrlBase::DoGetBestSize() const
 {

-    wxSize sizeText(150,0);
+    int width = m_text ? m_text->GetBestSize().x : 80;

 
 

-    if ( m_text )
-        sizeText = m_text->GetBestSize();
+    return GetSizeFromTextSize(width);
+}

 
 

-    // TODO: Better method to calculate close-to-native control height.
+wxSize wxComboCtrlBase::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    // Calculate close-to-native control height

 
     int fhei;
 
     int fhei;

-    if ( m_font.Ok() )
+
+#if wxUSE_COMBOBOX && (defined(__WXMSW__) || defined(__WXGTK__)) \
+        && !defined(__WXUNIVERSAL__)
+    wxComboBox* cb = new wxComboBox;
+    cb->Hide();
+    cb->Create(const_cast<wxComboCtrlBase*>(this), wxID_ANY);
+    if ( m_font.IsOk() )
+        cb->SetFont(m_font);
+    fhei = cb->GetBestSize().y;
+    cb->Destroy();
+#else
+    if ( m_font.IsOk() )

         fhei = (m_font.GetPointSize()*2) + 5;
         fhei = (m_font.GetPointSize()*2) + 5;

-    else if ( wxNORMAL_FONT->Ok() )
+    else if ( wxNORMAL_FONT->IsOk() )

         fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
     else
         fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
     else

-        fhei = sizeText.y + 4;
+        fhei = 22;
+#endif // only for wxComboBox on MSW or GTK

 
 

-    // Need to force height to accomodate bitmap?
+    // Need to force height to accommodate bitmap?

     int btnSizeY = m_btnSize.y;
     int btnSizeY = m_btnSize.y;

-    if ( m_bmpNormal.Ok() && fhei < btnSizeY )
+    if ( m_bmpNormal.IsOk() && fhei < btnSizeY )

         fhei = btnSizeY;
 
     // Control height doesn't depend on border
         fhei = btnSizeY;
 
     // Control height doesn't depend on border


@@ -1384,11 +1406,6 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
         fhei += 4;
 */
 
         fhei += 4;
 */
 

-    // Final adjustments
-#ifdef __WXGTK__
-    fhei += 1;
-#endif
-

 #ifdef __WXMAC__
     // these are the numbers from the HIG:
     switch ( m_windowVariant )
 #ifdef __WXMAC__
     // these are the numbers from the HIG:
     switch ( m_windowVariant )


@@ -1407,11 +1424,19 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
 #endif
 
     fhei += 2 * FOCUS_RING;
 #endif
 
     fhei += 2 * FOCUS_RING;

-    int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;

 
 

-    wxSize ret(width, fhei);
-    CacheBestSize(ret);
-    return ret;
+    // Calculate width
+    int fwid = xlen + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
+
+    // Add the margins we have previously set
+    wxPoint marg( GetMargins() );
+    fwid += wxMax(0, marg.x);
+    fhei += wxMax(0, marg.y);
+
+    if ( ylen > 0 )
+        fhei += ylen - GetCharHeight();
+
+    return wxSize(fwid, fhei);

 }
 
 void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
 }
 
 void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )


@@ -1693,7 +1718,7 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
         dc.DrawRectangle(rect);
     }
 
         dc.DrawRectangle(rect);
     }
 

-    if ( !m_bmpNormal.Ok() )
+    if ( !m_bmpNormal.IsOk() )

     {
         if ( flags & Button_BitmapOnly )
             return;
     {
         if ( flags & Button_BitmapOnly )
             return;


@@ -1743,6 +1768,7 @@ void wxComboCtrlBase::RecalcAndRefresh()
     if ( IsCreated() )
     {
         wxSizeEvent evt(GetSize(),GetId());
     if ( IsCreated() )
     {
         wxSizeEvent evt(GetSize(),GetId());

+        evt.SetEventObject(this);

         GetEventHandler()->ProcessEvent(evt);
         Refresh();
     }
         GetEventHandler()->ProcessEvent(evt);
         Refresh();
     }


@@ -1761,7 +1787,7 @@ void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
         return;
     }
 
         return;
     }
 

-    if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
+    if ( event.GetEventType() == wxEVT_TEXT )

     {
         if ( m_ignoreEvtText > 0 )
         {
     {
         if ( m_ignoreEvtText > 0 )
         {


@@ -2024,15 +2050,22 @@ void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
 
 void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {
 
 void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
 {

+    // On Mac, setting focus here leads to infinite recursion and eventually
+    // a crash due to the SetFocus call producing another event.
+    // Handle Mac in OnIdleEvent using m_resetFocus.
+    

     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {
     if ( event.GetEventType() == wxEVT_SET_FOCUS )
     {

-        wxWindow* tc = GetTextCtrl();
-        if ( tc && tc != DoFindFocus() )
+        if ( GetTextCtrl() && !GetTextCtrl()->HasFocus() )

         {
         {

-            tc->SetFocus();
+#ifdef __WXMAC__
+            m_resetFocus = true;
+#else
+            GetTextCtrl()->SetFocus();
+#endif

         }
     }
         }
     }

-
+    

     Refresh();
 }
 
     Refresh();
 }
 


@@ -2041,9 +2074,8 @@ void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
     if ( m_resetFocus )
     {
         m_resetFocus = false;
     if ( m_resetFocus )
     {
         m_resetFocus = false;

-        wxWindow* tc = GetTextCtrl();
-        if ( tc )
-            tc->SetFocus();
+        if ( GetTextCtrl() )
+            GetTextCtrl()->SetFocus();

     }
 }
 
     }
 }
 


@@ -2201,7 +2233,7 @@ void wxComboCtrlBase::OnButtonClick()
 
 void wxComboCtrlBase::Popup()
 {
 
 void wxComboCtrlBase::Popup()
 {

-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+    wxCommandEvent event(wxEVT_COMBOBOX_DROPDOWN, GetId());

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


@@ -2487,7 +2519,7 @@ void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
 
     if ( generateEvent )
     {
 
     if ( generateEvent )
     {

-        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+        wxCommandEvent event(wxEVT_COMBOBOX_CLOSEUP, GetId());

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


@@ -2554,17 +2586,17 @@ void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
     m_bmpNormal = bmpNormal;
     m_blankButtonBg = blankButtonBg;
 
     m_bmpNormal = bmpNormal;
     m_blankButtonBg = blankButtonBg;
 

-    if ( bmpPressed.Ok() )
+    if ( bmpPressed.IsOk() )

         m_bmpPressed = bmpPressed;
     else
         m_bmpPressed = bmpNormal;
 
         m_bmpPressed = bmpPressed;
     else
         m_bmpPressed = bmpNormal;
 

-    if ( bmpHover.Ok() )
+    if ( bmpHover.IsOk() )

         m_bmpHover = bmpHover;
     else
         m_bmpHover = bmpNormal;
 
         m_bmpHover = bmpHover;
     else
         m_bmpHover = bmpNormal;
 

-    if ( bmpDisabled.Ok() )
+    if ( bmpDisabled.IsOk() )

         m_bmpDisabled = bmpDisabled;
     else
         m_bmpDisabled = bmpNormal;
         m_bmpDisabled = bmpDisabled;
     else
         m_bmpDisabled = bmpNormal;