only set focus on textctrl item if it exists (exists if combo box is editable)

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 4fa350e70970e8e776aec6bad0cfecb8e23b10a5..a3de1918ca76a5980c1391c8e8ee28ca4bb16360 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -128,7 +128,7 @@ wxSize wxComboBox::DoGetBestSize() const
 {
     wxSize size = m_choice->GetBestSize();
     
 {
     wxSize size = m_choice->GetBestSize();
     

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         wxSize  sizeText = m_text->GetBestSize();
         
     {
         wxSize  sizeText = m_text->GetBestSize();
         


@@ -143,7 +143,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     
     wxControl::DoMoveWindow(x, y, width, height);
 
     
     wxControl::DoMoveWindow(x, y, width, height);
 

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
         m_choice->SetSize(0, 0 , width, -1);
     }
     {
         m_choice->SetSize(0, 0 , width, -1);
     }


@@ -177,13 +177,16 @@ bool wxComboBox::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

- void wxComboBox::SetFocus()
- {
-    m_text->SetFocus();
- }
+void wxComboBox::SetFocus()
+{
+    if ( m_text != NULL) {
+        m_text->SetFocus();
+    }
+}

 
 
 
 

-void wxComboBox::DelegateTextChanged( const wxString& value ) {
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{

 }
 
 
 }
 
 


@@ -217,7 +220,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {

-        m_text = 0;
+        m_text = NULL;

     }
     else
     {
     }
     else
     {


@@ -241,7 +244,7 @@ wxString wxComboBox::GetValue() const
 {
     wxString        result;
     
 {
     wxString        result;
     

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
         result = m_choice->GetString( m_choice->GetSelection() );
     }
     {
         result = m_choice->GetString( m_choice->GetSelection() );
     }


@@ -261,7 +264,7 @@ void wxComboBox::SetValue(const wxString& value)
 // Clipboard operations
 void wxComboBox::Copy()
 {
 // Clipboard operations
 void wxComboBox::Copy()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

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


@@ -269,7 +272,7 @@ void wxComboBox::Copy()
 
 void wxComboBox::Cut()
 {
 
 void wxComboBox::Cut()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

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


@@ -277,7 +280,7 @@ void wxComboBox::Cut()
 
 void wxComboBox::Paste()
 {
 
 void wxComboBox::Paste()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

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


@@ -285,14 +288,14 @@ void wxComboBox::Paste()
 
 void wxComboBox::SetEditable(bool editable)
 {
 
 void wxComboBox::SetEditable(bool editable)
 {

-    if ( ( m_text == 0 ) && editable )
+    if ( ( m_text == NULL ) && editable )

     {
         m_text = new wxComboBoxText( this );
     }
     {
         m_text = new wxComboBoxText( this );
     }

-    else if ( ( m_text != 0 ) && !editable )
+    else if ( ( m_text != NULL ) && !editable )

     {
         delete m_text;
     {
         delete m_text;

-        m_text = 0;
+        m_text = NULL;

     }
 
     int currentX, currentY;
     }
 
     int currentX, currentY;


@@ -369,7 +372,7 @@ void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );
     
 {
     m_choice->SetSelection( n );
     

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         m_text->SetValue( GetString( n ) );
     }
     {
         m_text->SetValue( GetString( n ) );
     }

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 4fa350e70970e8e776aec6bad0cfecb8e23b10a5..a3de1918ca76a5980c1391c8e8ee28ca4bb16360 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -128,7 +128,7 @@ wxSize wxComboBox::DoGetBestSize() const
 {
     wxSize size = m_choice->GetBestSize();
     
 {
     wxSize size = m_choice->GetBestSize();
     

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         wxSize  sizeText = m_text->GetBestSize();
         
     {
         wxSize  sizeText = m_text->GetBestSize();
         


@@ -143,7 +143,7 @@ void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
     
     wxControl::DoMoveWindow(x, y, width, height);
 
     
     wxControl::DoMoveWindow(x, y, width, height);
 

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
         m_choice->SetSize(0, 0 , width, -1);
     }
     {
         m_choice->SetSize(0, 0 , width, -1);
     }


@@ -177,13 +177,16 @@ bool wxComboBox::Show(bool show)
     return TRUE;
 }
 
     return TRUE;
 }
 

- void wxComboBox::SetFocus()
- {
-    m_text->SetFocus();
- }
+void wxComboBox::SetFocus()
+{
+    if ( m_text != NULL) {
+        m_text->SetFocus();
+    }
+}

 
 
 
 

-void wxComboBox::DelegateTextChanged( const wxString& value ) {
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{

 }
 
 
 }
 
 


@@ -217,7 +220,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {
     wxSize csize = size;
     if ( style & wxCB_READONLY )
     {

-        m_text = 0;
+        m_text = NULL;

     }
     else
     {
     }
     else
     {


@@ -241,7 +244,7 @@ wxString wxComboBox::GetValue() const
 {
     wxString        result;
     
 {
     wxString        result;
     

-    if ( m_text == 0 )
+    if ( m_text == NULL )

     {
         result = m_choice->GetString( m_choice->GetSelection() );
     }
     {
         result = m_choice->GetString( m_choice->GetSelection() );
     }


@@ -261,7 +264,7 @@ void wxComboBox::SetValue(const wxString& value)
 // Clipboard operations
 void wxComboBox::Copy()
 {
 // Clipboard operations
 void wxComboBox::Copy()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

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


@@ -269,7 +272,7 @@ void wxComboBox::Copy()
 
 void wxComboBox::Cut()
 {
 
 void wxComboBox::Cut()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

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


@@ -277,7 +280,7 @@ void wxComboBox::Cut()
 
 void wxComboBox::Paste()
 {
 
 void wxComboBox::Paste()
 {

-    if ( m_text != 0 )
+    if ( m_text != NULL )

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


@@ -285,14 +288,14 @@ void wxComboBox::Paste()
 
 void wxComboBox::SetEditable(bool editable)
 {
 
 void wxComboBox::SetEditable(bool editable)
 {

-    if ( ( m_text == 0 ) && editable )
+    if ( ( m_text == NULL ) && editable )

     {
         m_text = new wxComboBoxText( this );
     }
     {
         m_text = new wxComboBoxText( this );
     }

-    else if ( ( m_text != 0 ) && !editable )
+    else if ( ( m_text != NULL ) && !editable )

     {
         delete m_text;
     {
         delete m_text;

-        m_text = 0;
+        m_text = NULL;

     }
 
     int currentX, currentY;
     }
 
     int currentX, currentY;


@@ -369,7 +372,7 @@ void wxComboBox::SetSelection(int n)
 {
     m_choice->SetSelection( n );
     
 {
     m_choice->SetSelection( n );
     

-    if ( m_text != 0 )
+    if ( m_text != NULL )

     {
         m_text->SetValue( GetString( n ) );
     }
     {
         m_text->SetValue( GetString( n ) );
     }