first step into modernizing MLTE-Classic as it still seems to be the most complete...

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 256853fbccec22a75c327a2ae08e1495e3ca8769..dbe2c63b75b8ffddd74cca403d0d2ec34fde9755 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univcombobox.h"
 #endif
 
     #pragma implementation "univcombobox.h"
 #endif
 


@@ -41,6 +41,7 @@
     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #endif
 

+#include "wx/tooltip.h"

 #include "wx/popupwin.h"
 
 #include "wx/univ/renderer.h"
 #include "wx/popupwin.h"
 
 #include "wx/univ/renderer.h"


@@ -70,7 +71,7 @@ class wxComboButton : public wxBitmapButton
 {
 public:
     wxComboButton(wxComboControl *combo)
 {
 public:
     wxComboButton(wxComboControl *combo)

-        : wxBitmapButton(combo->GetParent(), -1, wxNullBitmap,
+        : wxBitmapButton(combo->GetParent(), wxID_ANY, wxNullBitmap,

                          wxDefaultPosition, wxDefaultSize,
                          wxBORDER_NONE | wxBU_EXACTFIT)
     {
                          wxDefaultPosition, wxDefaultSize,
                          wxBORDER_NONE | wxBU_EXACTFIT)
     {


@@ -92,7 +93,7 @@ public:
     }
 
 protected:
     }
 
 protected:

-    void OnButton(wxCommandEvent& event) { m_combo->ShowPopup(); }
+    void OnButton(wxCommandEvent& WXUNUSED(event)) { m_combo->ShowPopup(); }

 
     virtual wxSize DoGetBestClientSize() const
     {
 
     virtual wxSize DoGetBestClientSize() const
     {


@@ -121,9 +122,14 @@ public:
     virtual ~wxComboListBox();
 
     // implement wxComboPopup methods
     virtual ~wxComboListBox();
 
     // implement wxComboPopup methods

-    virtual bool SetSelection(const wxString& value);
+    virtual bool SetSelection(const wxString& s);

     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();

+    virtual wxCoord GetBestWidth() const;
+
+    // fix virtual function hiding
+    virtual void SetSelection(int n) { DoSetSelection(n, true); }
+    void SetSelection(int n, bool select) { DoSetSelection(n, select); }

 
 protected:
     // we shouldn't return height too big from here
 
 protected:
     // we shouldn't return height too big from here


@@ -178,12 +184,12 @@ private:
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxComboButton, wxButton)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxComboButton, wxButton)

-    EVT_BUTTON(-1, wxComboButton::OnButton)
+    EVT_BUTTON(wxID_ANY, wxComboButton::OnButton)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxComboListBox, wxListBox)

-    EVT_LISTBOX(-1, wxComboListBox::OnSelect)
-    EVT_LISTBOX_DCLICK(-1, wxComboListBox::OnSelect)
+    EVT_LISTBOX(wxID_ANY, wxComboListBox::OnSelect)
+    EVT_LISTBOX_DCLICK(wxID_ANY, wxComboListBox::OnSelect)

     EVT_MOTION(wxComboListBox::OnMouseMove)
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
 END_EVENT_TABLE()
     EVT_MOTION(wxComboListBox::OnMouseMove)
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
 END_EVENT_TABLE()


@@ -196,7 +202,7 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxComboTextCtrl, wxTextCtrl)
     EVT_KEY_DOWN(wxComboTextCtrl::OnKey)
     EVT_KEY_UP(wxComboTextCtrl::OnKey)
 BEGIN_EVENT_TABLE(wxComboTextCtrl, wxTextCtrl)
     EVT_KEY_DOWN(wxComboTextCtrl::OnKey)
     EVT_KEY_UP(wxComboTextCtrl::OnKey)

-    EVT_TEXT(-1, wxComboTextCtrl::OnText)
+    EVT_TEXT(wxID_ANY, wxComboTextCtrl::OnText)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)


@@ -213,7 +219,7 @@ void wxComboControl::Init()
 {
     m_popup = (wxComboPopup *)NULL;
     m_winPopup = (wxPopupComboWindow *)NULL;
 {
     m_popup = (wxComboPopup *)NULL;
     m_winPopup = (wxPopupComboWindow *)NULL;

-    m_isPopupShown = FALSE;
+    m_isPopupShown = false;

     m_btn = NULL;
     m_text = NULL;
 }
     m_btn = NULL;
     m_text = NULL;
 }


@@ -232,7 +238,7 @@ bool wxComboControl::Create(wxWindow *parent,
     style &= ~wxBORDER_NONE;
     style |= wxBORDER_SUNKEN;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
     style &= ~wxBORDER_NONE;
     style |= wxBORDER_SUNKEN;
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
     // create the text control and the button as our siblings (*not* children),
     // don't care about size/position here - they will be set in DoMoveWindow()
 
     // create the text control and the button as our siblings (*not* children),
     // don't care about size/position here - they will be set in DoMoveWindow()


@@ -244,10 +250,10 @@ bool wxComboControl::Create(wxWindow *parent,
 
     // for compatibility with the other ports, the height specified is the
     // combined height of the combobox itself and the popup
 
     // for compatibility with the other ports, the height specified is the
     // combined height of the combobox itself and the popup

-    if ( size.y == -1 )
+    if ( size.y == wxDefaultCoord )

     {
         // ok, use default height for popup too
     {
         // ok, use default height for popup too

-        m_heightPopup = -1;
+        m_heightPopup = wxDefaultCoord;

     }
     else
     {
     }
     else
     {


@@ -263,20 +269,20 @@ bool wxComboControl::Create(wxWindow *parent,
 
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to
 
     // have to disable this window to avoid interfering it with message
     // processing to the text and the button... but pretend it is enabled to

-    // make IsEnabled() return TRUE
-    wxControl::Enable(FALSE); // don't use non virtual Disable() here!
-    m_isEnabled = TRUE;
+    // make IsEnabled() return true
+    wxControl::Enable(false); // don't use non virtual Disable() here!
+    m_isEnabled = true;

 
     CreateInputHandler(wxINP_HANDLER_COMBOBOX);
 
 
     CreateInputHandler(wxINP_HANDLER_COMBOBOX);
 

-    return TRUE;
+    return true;

 }
 
 wxComboControl::~wxComboControl()
 {
     // as the button and the text control are the parent's children and not
     // ours, we have to delete them manually - they are not deleted
 }
 
 wxComboControl::~wxComboControl()
 {
     // as the button and the text control are the parent's children and not
     // ours, we have to delete them manually - they are not deleted

-    // automatically by wxWindows when we're deleted
+    // automatically by wxWidgets when we're deleted

     delete m_btn;
     delete m_text;
 
     delete m_btn;
     delete m_text;
 


@@ -288,7 +294,7 @@ wxComboControl::~wxComboControl()
 // ----------------------------------------------------------------------------
 
 void wxComboControl::DoSetSize(int x, int y,
 // ----------------------------------------------------------------------------
 
 void wxComboControl::DoSetSize(int x, int y,

-                               int width, int height,
+                               int width, int WXUNUSED(height),

                                int sizeFlags)
 {
     // combo height is always fixed
                                int sizeFlags)
 {
     // combo height is always fixed


@@ -299,8 +305,15 @@ wxSize wxComboControl::DoGetBestClientSize() const
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 {
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();

+    wxCoord widthPopup = 0;

 
 

-    return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y));
+    if (m_popup)
+    {
+        widthPopup = m_popup->GetBestWidth();
+    }
+
+    return wxSize(wxMax(sizeText.x + g_comboMargin + sizeBtn.x, widthPopup),
+                  wxMax(sizeBtn.y, sizeText.y));

 }
 
 void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxComboControl::DoMoveWindow(int x, int y, int width, int height)


@@ -329,18 +342,18 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
 bool wxComboControl::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )
 bool wxComboControl::Enable(bool enable)
 {
     if ( !wxControl::Enable(enable) )

-        return FALSE;
+        return false;

 
     m_btn->Enable(enable);
     m_text->Enable(enable);
 
 
     m_btn->Enable(enable);
     m_text->Enable(enable);
 

-    return TRUE;
+    return true;

 }
 
 bool wxComboControl::Show(bool show)
 {
     if ( !wxControl::Show(show) )
 }
 
 bool wxComboControl::Show(bool show)
 {
     if ( !wxControl::Show(show) )

-        return FALSE;
+        return false;

 
     if (m_btn)
         m_btn->Show(show);
 
     if (m_btn)
         m_btn->Show(show);


@@ -348,8 +361,31 @@ bool wxComboControl::Show(bool show)
     if (m_text)
         m_text->Show(show);
 
     if (m_text)
         m_text->Show(show);
 

-    return TRUE;
+    return true;
+}
+
+#if wxUSE_TOOLTIPS
+void wxComboControl::DoSetToolTip(wxToolTip *tooltip)
+{
+    wxControl::DoSetToolTip(tooltip);
+
+    // Set tool tip for button and text box
+    if (m_text && m_btn)
+    {
+        if (tooltip)
+        {
+            const wxString &tip = tooltip->GetTip();
+            m_text->SetToolTip(tip);
+            m_btn->SetToolTip(tip);
+        }
+        else
+        {
+            m_text->SetToolTip(NULL);
+            m_btn->SetToolTip(NULL);
+        }
+    }

 }
 }

+#endif // wxUSE_TOOLTIPS

 
 // ----------------------------------------------------------------------------
 // popup window handling
 
 // ----------------------------------------------------------------------------
 // popup window handling


@@ -369,7 +405,7 @@ void wxComboControl::ShowPopup()
 
     // size and position the popup window correctly
     m_winPopup->SetSize(GetSize().x,
 
     // size and position the popup window correctly
     m_winPopup->SetSize(GetSize().x,

-                        m_heightPopup == -1 ? control->GetBestSize().y
+                        m_heightPopup == wxDefaultCoord ? control->GetBestSize().y

                                             : m_heightPopup);
     wxSize sizePopup = m_winPopup->GetClientSize();
     control->SetSize(0, 0, sizePopup.x, sizePopup.y);
                                             : m_heightPopup);
     wxSize sizePopup = m_winPopup->GetClientSize();
     control->SetSize(0, 0, sizePopup.x, sizePopup.y);


@@ -390,7 +426,7 @@ void wxComboControl::ShowPopup()
     m_text->SelectAll();
     m_popup->SetSelection(m_text->GetValue());
 
     m_text->SelectAll();
     m_popup->SetSelection(m_text->GetValue());
 

-    m_isPopupShown = TRUE;
+    m_isPopupShown = true;

 }
 
 void wxComboControl::HidePopup()
 }
 
 void wxComboControl::HidePopup()


@@ -400,7 +436,7 @@ void wxComboControl::HidePopup()
 
     m_winPopup->Dismiss();
 
 
     m_winPopup->Dismiss();
 

-    m_isPopupShown = FALSE;
+    m_isPopupShown = false;

 }
 
 void wxComboControl::OnSelect(const wxString& value)
 }
 
 void wxComboControl::OnSelect(const wxString& value)


@@ -425,7 +461,7 @@ wxComboTextCtrl::wxComboTextCtrl(wxComboControl *combo,
                                  const wxString& value,
                                  long style,
                                  const wxValidator& validator)
                                  const wxString& value,
                                  long style,
                                  const wxValidator& validator)

-               : wxTextCtrl(combo->GetParent(), -1, value,
+               : wxTextCtrl(combo->GetParent(), wxID_ANY, value,

                             wxDefaultPosition, wxDefaultSize,
                             wxBORDER_NONE | style,
                             validator)
                             wxDefaultPosition, wxDefaultSize,
                             wxBORDER_NONE | style,
                             validator)


@@ -488,7 +524,7 @@ void wxComboTextCtrl::OnKey(wxKeyEvent& event)
 // ----------------------------------------------------------------------------
 
 wxComboListBox::wxComboListBox(wxComboControl *combo, int style)
 // ----------------------------------------------------------------------------
 
 wxComboListBox::wxComboListBox(wxComboControl *combo, int style)

-              : wxListBox(combo->GetPopupWindow(), -1,
+              : wxListBox(combo->GetPopupWindow(), wxID_ANY,

                           wxDefaultPosition, wxDefaultSize,
                           0, NULL,
                           wxBORDER_SIMPLE | wxLB_INT_HEIGHT | style),
                           wxDefaultPosition, wxDefaultSize,
                           0, NULL,
                           wxBORDER_SIMPLE | wxLB_INT_HEIGHT | style),


@@ -517,10 +553,10 @@ bool wxComboListBox::SetSelection(const wxString& value)
     else if ( !FindItem(value) )
     {
         // no match att all
     else if ( !FindItem(value) )
     {
         // no match att all

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxComboListBox::OnSelect(wxCommandEvent& event)
 }
 
 void wxComboListBox::OnSelect(wxCommandEvent& event)


@@ -546,7 +582,7 @@ void wxComboListBox::OnSelect(wxCommandEvent& event)
 void wxComboListBox::OnShow()
 {
     // nobody clicked us yet
 void wxComboListBox::OnShow()
 {
     // nobody clicked us yet

-    m_clicked = FALSE;
+    m_clicked = false;

 }
 
 bool wxComboListBox::PerformAction(const wxControlAction& action,
 }
 
 bool wxComboListBox::PerformAction(const wxControlAction& action,


@@ -559,7 +595,7 @@ bool wxComboListBox::PerformAction(const wxControlAction& action,
         // we don't let the listbox handle this as instead of just using the
         // single key presses, as usual, we use the text ctrl value as prefix
         // and this is done by wxComboControl itself
         // we don't let the listbox handle this as instead of just using the
         // single key presses, as usual, we use the text ctrl value as prefix
         // and this is done by wxComboControl itself

-        return TRUE;
+        return true;

     }
 
     return wxListBox::PerformAction(action, numArg, strArg);
     }
 
     return wxListBox::PerformAction(action, numArg, strArg);


@@ -568,7 +604,7 @@ bool wxComboListBox::PerformAction(const wxControlAction& action,
 void wxComboListBox::OnLeftUp(wxMouseEvent& event)
 {
     // we should dismiss the combo now
 void wxComboListBox::OnLeftUp(wxMouseEvent& event)
 {
     // we should dismiss the combo now

-    m_clicked = TRUE;
+    m_clicked = true;

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


@@ -591,6 +627,12 @@ void wxComboListBox::OnMouseMove(wxMouseEvent& event)
     }
 }
 
     }
 }
 

+wxCoord wxComboListBox::GetBestWidth() const
+{
+    wxSize size = wxListBox::GetBestSize();
+    return size.x;
+}
+

 wxSize wxComboListBox::DoGetBestClientSize() const
 {
     // don't return size too big or we risk to not fit on the screen
 wxSize wxComboListBox::DoGetBestClientSize() const
 {
     // don't return size too big or we risk to not fit on the screen


@@ -617,13 +659,44 @@ void wxComboBox::Init()
     m_lbox = (wxListBox *)NULL;
 }
 
     m_lbox = (wxListBox *)NULL;
 }
 

+wxComboBox::wxComboBox(wxWindow *parent,
+                       wxWindowID id,
+                       const wxString& value,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       const wxArrayString& choices,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    Init();
+
+    Create(parent, id, value, pos, size, choices, style, validator, name);
+}
+
+bool wxComboBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, id, value, pos, size, chs.GetCount(),
+                  chs.GetStrings(), style, validator, name);
+}
+

 bool wxComboBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
                         const wxSize& size,
                         int n,
 bool wxComboBox::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& value,
                         const wxPoint& pos,
                         const wxSize& size,
                         int n,

-                        const wxString *choices,
+                        const wxString choices[],

                         long style,
                         const wxValidator& validator,
                         const wxString& name)
                         long style,
                         const wxValidator& validator,
                         const wxString& name)


@@ -631,7 +704,7 @@ bool wxComboBox::Create(wxWindow *parent,
     if ( !wxComboControl::Create(parent, id, value, pos, size, style,
                                  validator, name) )
     {
     if ( !wxComboControl::Create(parent, id, value, pos, size, style,
                                  validator, name) )
     {

-        return FALSE;
+        return false;

     }
 
     wxComboListBox *combolbox =
     }
 
     wxComboListBox *combolbox =


@@ -641,7 +714,7 @@ bool wxComboBox::Create(wxWindow *parent,
 
     SetPopupControl(combolbox);
 
 
     SetPopupControl(combolbox);
 

-    return TRUE;
+    return true;

 }
 
 wxComboBox::~wxComboBox()
 }
 
 wxComboBox::~wxComboBox()


@@ -692,7 +765,7 @@ long wxComboBox::GetInsertionPoint() const
     return GetText()->GetInsertionPoint();
 }
 
     return GetText()->GetInsertionPoint();
 }
 

-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const

 {
     return GetText()->GetLastPosition();
 }
 {
     return GetText()->GetLastPosition();
 }


@@ -761,7 +834,7 @@ int wxComboBox::FindString(const wxString& s) const
     return GetLBox()->FindString(s);
 }
 
     return GetLBox()->FindString(s);
 }
 

-void wxComboBox::Select(int n)
+void wxComboBox::SetSelection(int n)

 {
     wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );
 
 {
     wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );
 


@@ -774,9 +847,9 @@ int wxComboBox::GetSelection() const
 #if 1 // FIXME:: What is the correct behavior?
     // if the current value isn't one of the listbox strings, return -1
     return GetLBox()->GetSelection();
 #if 1 // FIXME:: What is the correct behavior?
     // if the current value isn't one of the listbox strings, return -1
     return GetLBox()->GetSelection();

-#else    
-    // Why oh why is this done this way? 
-    // It is not because the value displayed in the text can be found 
+#else
+    // Why oh why is this done this way?
+    // It is not because the value displayed in the text can be found

     // in the list that it is the item that is selected!
     return FindString(GetText()->GetValue());
 #endif
     // in the list that it is the item that is selected!
     return FindString(GetText()->GetValue());
 #endif


@@ -787,6 +860,18 @@ int wxComboBox::DoAppend(const wxString& item)
     return GetLBox()->Append(item);
 }
 
     return GetLBox()->Append(item);
 }
 

+int wxComboBox::DoInsert(const wxString& item, int pos)
+{
+    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+
+    if (pos == GetCount())
+        return DoAppend(item);
+
+    GetLBox()->Insert(item, pos);
+    return pos;
+}
+

 void wxComboBox::DoSetItemClientData(int n, void* clientData)
 {
     GetLBox()->SetClientData(n, clientData);
 void wxComboBox::DoSetItemClientData(int n, void* clientData)
 {
     GetLBox()->SetClientData(n, clientData);


@@ -807,6 +892,69 @@ wxClientData* wxComboBox::DoGetItemClientObject(int n) const
     return GetLBox()->GetClientObject(n);
 }
 
     return GetLBox()->GetClientObject(n);
 }
 

+bool wxComboBox::IsEditable() const
+{
+    return GetText() != NULL && (!HasFlag(wxCB_READONLY) || GetText()->IsEditable());
+}
+
+void wxComboBox::Undo()
+{
+    if (IsEditable())
+        GetText()->Undo();
+}
+
+void wxComboBox::Redo()
+{
+    if (IsEditable())
+        GetText()->Redo();
+}
+
+void wxComboBox::SelectAll()
+{
+    GetText()->SelectAll();
+}
+
+bool wxComboBox::CanCopy() const
+{
+    if (GetText() != NULL)
+        return GetText()->CanCopy();
+    else
+        return false;
+}
+
+bool wxComboBox::CanCut() const
+{
+    if (GetText() != NULL)
+        return GetText()->CanCut();
+    else
+        return false;
+}
+
+bool wxComboBox::CanPaste() const
+{
+    if (IsEditable())
+        return GetText()->CanPaste();
+    else
+        return false;
+}
+
+bool wxComboBox::CanUndo() const
+{
+    if (IsEditable())
+        return GetText()->CanUndo();
+    else
+        return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+    if (IsEditable())
+        return GetText()->CanRedo();
+    else
+        return false;
+}
+
+

 // ----------------------------------------------------------------------------
 // input handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // input handling
 // ----------------------------------------------------------------------------


@@ -828,14 +976,14 @@ bool wxComboControl::PerformAction(const wxControlAction& action,
                                    long numArg,
                                    const wxString& strArg)
 {
                                    long numArg,
                                    const wxString& strArg)
 {

-    bool processed = FALSE;
+    bool processed = false;

     if ( action == wxACTION_COMBOBOX_POPUP )
     {
         if ( !m_isPopupShown )
         {
             ShowPopup();
 
     if ( action == wxACTION_COMBOBOX_POPUP )
     {
         if ( !m_isPopupShown )
         {
             ShowPopup();
 

-            processed = TRUE;
+            processed = true;

         }
     }
     else if ( action == wxACTION_COMBOBOX_DISMISS )
         }
     }
     else if ( action == wxACTION_COMBOBOX_DISMISS )


@@ -844,7 +992,7 @@ bool wxComboControl::PerformAction(const wxControlAction& action,
         {
             HidePopup();
 
         {
             HidePopup();
 

-            processed = TRUE;
+            processed = true;

         }
     }
 
         }
     }
 


@@ -854,7 +1002,7 @@ bool wxComboControl::PerformAction(const wxControlAction& action,
         return wxControl::PerformAction(action, numArg, strArg);
     }
 
         return wxControl::PerformAction(action, numArg, strArg);
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -884,11 +1032,11 @@ bool wxStdComboBoxInputHandler::HandleKey(wxInputConsumer *consumer,
                 break;
         }
 
                 break;
         }
 

-        if ( !!action )
+        if ( !action.IsEmpty() )

         {
             consumer->PerformAction(action);
 
         {
             consumer->PerformAction(action);
 

-            return TRUE;
+            return true;

         }
     }
 
         }
     }