Removed #include <typeinfo> (since C++ RTTI is no longer used)

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

diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index 1174358e298f91782f832460c11b4c65fdf95b00..5bae2472354f56d1f31d76a52d7de72c4e63117d 100644 (file)
--- a/src/osx/carbon/combobox.cpp
+++ b/src/osx/carbon/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor, Dan "Bud" Keith (composite combobox)
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Stefan Csomor, Dan "Bud" Keith (composite combobox)
 // Modified by:


@@ -23,7 +23,7 @@
     #include "wx/textctrl.h"
 #endif
 
     #include "wx/textctrl.h"
 #endif
 

-#include "wx/osx/uma.h"
+#include "wx/osx/private.h"

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


@@ -34,17 +34,6 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

-static int nextPopUpMenuId = 1000 ;
-
-MenuHandle NewUniqueMenu()
-{
-    MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
-    nextPopUpMenuId++ ;
-
-    return handle ;
-}
-
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -651,7 +640,7 @@ bool wxComboBox::CanRedo() const
         return false;
 }
 
         return false;
 }
 

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

 {
 /*
     For consistency with other platforms, clicking in the text area does not constitute a selection
 {
 /*
     For consistency with other platforms, clicking in the text area does not constitute a selection


@@ -662,7 +651,7 @@ wxInt32 wxComboBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
     ProcessCommand(event);
 */
 
     ProcessCommand(event);
 */
 

-    return noErr ;
+    return true ;

 }
 
 #endif // wxUSE_COMBOBOX
 }
 
 #endif // wxUSE_COMBOBOX