allow changing the page from keyboard in property sheet like controls even when the...

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e78ccaaa1ac4d2755bfbce26ab37ec74ba176eb1..b9792d8df82ce6f08038eb2aac335ff184e0af75 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -25,9 +25,10 @@
 
 #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"


@@ -460,7 +461,7 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
 {
     int keycode = event.GetKeyCode();
 
 {
     int keycode = event.GetKeyCode();
 

-    if ( keycode == WXK_TAB )
+    if ( keycode == WXK_TAB && !m_combo->IsPopupShown() )

     {
         wxNavigationKeyEvent evt;
         evt.SetFlags(wxNavigationKeyEvent::FromTab|
     {
         wxNavigationKeyEvent evt;
         evt.SetFlags(wxNavigationKeyEvent::FromTab|


@@ -491,19 +492,7 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
              ( keycode != WXK_RIGHT && keycode != WXK_LEFT )
             )
         {
              ( 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);
+            popupInterface->OnComboKeyEvent(event);

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


@@ -680,7 +669,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,6 +705,16 @@ 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;
 }
 


@@ -732,24 +731,23 @@ void wxComboCtrlBase::InstallInputHandlers( bool alsoTextCtrl )
     m_extraEvtHandler = 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,15 +772,7 @@ 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;
+    DestroyPopup();

 
     RemoveEventHandler(m_extraEvtHandler);
 
 
     RemoveEventHandler(m_extraEvtHandler);
 


@@ -803,7 +793,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 +801,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 +826,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 +879,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 +997,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() )


@@ -1084,7 +1075,7 @@ void wxComboCtrlBase::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 wxComboCtrlBase::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;


@@ -1118,8 +1109,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;
 


@@ -1277,8 +1274,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();
 }
 


@@ -1531,19 +1531,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") );
+    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_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();
     }


@@ -1821,7 +1841,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;


@@ -1831,6 +1851,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,