Redirect wxComboBox::SetFocus to its text field Part I.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 718fe840d66f03b08c38d8c6b962196ece5c087b..7bac2630c465cd8748c4c63ca68df9b141bd3554 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -191,6 +191,11 @@ bool wxComboBox::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

+ void wxComboBox::SetFocus()
+ {
+    m_text->SetFocus();
+ }
+

 
 void wxComboBox::DelegateTextChanged( const wxString& value ) {
 }
 
 void wxComboBox::DelegateTextChanged( const wxString& value ) {
 }


@@ -206,8 +211,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,

-                  int n, const wxString choices[],
-                  long style,
+           int n, const wxString choices[],
+           long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {


@@ -239,7 +244,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     for ( int i = 0 ; i < n ; i++ )
     {
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     for ( int i = 0 ; i < n ; i++ )
     {

-       m_choice->DoAppend( choices[ i ] );
+        m_choice->DoAppend( choices[ i ] );

     }
 
     // have to disable this window to avoid interfering it with message
     }
 
     // have to disable this window to avoid interfering it with message


@@ -423,7 +428,7 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
 void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
 void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );

-       event.SetInt(GetSelection());
+    event.SetInt(GetSelection());

     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 718fe840d66f03b08c38d8c6b962196ece5c087b..7bac2630c465cd8748c4c63ca68df9b141bd3554 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -191,6 +191,11 @@ bool wxComboBox::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

+ void wxComboBox::SetFocus()
+ {
+    m_text->SetFocus();
+ }
+

 
 void wxComboBox::DelegateTextChanged( const wxString& value ) {
 }
 
 void wxComboBox::DelegateTextChanged( const wxString& value ) {
 }


@@ -206,8 +211,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,

-                  int n, const wxString choices[],
-                  long style,
+           int n, const wxString choices[],
+           long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {


@@ -239,7 +244,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     for ( int i = 0 ; i < n ; i++ )
     {
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
     for ( int i = 0 ; i < n ; i++ )
     {

-       m_choice->DoAppend( choices[ i ] );
+        m_choice->DoAppend( choices[ i ] );

     }
 
     // have to disable this window to avoid interfering it with message
     }
 
     // have to disable this window to avoid interfering it with message


@@ -423,7 +428,7 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
 void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
 void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );

-       event.SetInt(GetSelection());
+    event.SetInt(GetSelection());

     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);