Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / osx / carbon / combobxc.cpp

diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp
index 8a67fd323fe165d292af45532e4455b7501a44f3..b6913002468b9cdf51026db3fe289e94b649cde9 100644 (file)
--- a/src/osx/carbon/combobxc.cpp
+++ b/src/osx/carbon/combobxc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/combobxc.cpp
+// Name:        src/osx/carbon/combobxc.cpp

 // Purpose:     wxComboBox class using HIView ComboBox
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxComboBox class using HIView ComboBox
 // Author:      Stefan Csomor
 // Modified by:


@@ -25,8 +25,6 @@
 #endif
 #endif
 
 #endif
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-

 #if TARGET_API_MAC_OSX
 #define USE_HICOMBOBOX 1 //use hi combobox define
 #else
 #if TARGET_API_MAC_OSX
 #define USE_HICOMBOBOX 1 //use hi combobox define
 #else


@@ -219,14 +217,8 @@ wxComboBox::~wxComboBox()
     // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
     // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now

-    if (m_text != NULL) {
-        delete m_text;
-        m_text = NULL;
-    }
-    if (m_choice != NULL) {
-        delete m_choice;
-        m_choice = NULL;
-    }
+    wxDELETE( m_text );
+    wxDELETE( m_choice );

 }
 
 
 }
 
 


@@ -349,7 +341,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     m_text = NULL;
     m_choice = NULL;
 #if USE_HICOMBOBOX
     m_text = NULL;
     m_choice = NULL;
 #if USE_HICOMBOBOX

-    m_macIsUserPane = false;
+    DontCreatePeer();

 #endif
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )
 #endif
     if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
                             wxDefaultValidator, name) )


@@ -484,10 +476,9 @@ void wxComboBox::SetEditable(bool editable)
     {
         m_text = new wxComboBoxText( this );
     }
     {
         m_text = new wxComboBoxText( this );
     }

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

     {
     {

-        delete m_text;
-        m_text = NULL;
+        wxDELETE(m_text);

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


@@ -782,12 +773,12 @@ bool wxComboBox::CanRedo() const
 #endif
 }
 
 #endif
 }
 

-wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+bool wxComboBox::OSXHandleClicked( double timestampsec )

 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);

-    return noErr;
+    return true;

 }
 }