Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

[wxWidgets.git] / src / osx / cocoa / combobox.mm

diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
index f18378013563df9b7e85908d63d6f8cd124cc4c1..a6c9e9b7c47883a0898f0ff3f3ba24a18a6b4bc3 100644 (file)
--- a/src/osx/cocoa/combobox.mm
+++ b/src/osx/cocoa/combobox.mm
@@ -46,7 +46,7 @@
 {
     wxUnusedVar(aNotification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
 {
     wxUnusedVar(aNotification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );

-    if ( impl )
+    if ( impl && impl->ShouldSendEvents() )

     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {


@@ -62,7 +62,7 @@
 {
     wxUnusedVar(notification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
 {
     wxUnusedVar(notification);
     wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );

-    if ( impl )
+    if ( impl && impl->ShouldSendEvents())

     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {
     {
         wxWindow* wxpeer = (wxWindow*) impl->GetWXPeer();
         if ( wxpeer ) {


@@ -95,7 +95,9 @@ int wxNSComboBoxControl::GetSelectedItem() const
 void wxNSComboBoxControl::SetSelectedItem(int item)
 {
     wxASSERT_MSG(item >= 0 && item < [m_comboBox numberOfItems], "Inavlid item index.");
 void wxNSComboBoxControl::SetSelectedItem(int item)
 {
     wxASSERT_MSG(item >= 0 && item < [m_comboBox numberOfItems], "Inavlid item index.");

+    SendEvents(false);

     [m_comboBox selectItemAtIndex: item];
     [m_comboBox selectItemAtIndex: item];

+    SendEvents(true);

 }
 
 int wxNSComboBoxControl::GetNumberOfItems() const
 }
 
 int wxNSComboBoxControl::GetNumberOfItems() const


@@ -110,12 +112,16 @@ void wxNSComboBoxControl::InsertItem(int pos, const wxString& item)
 
 void wxNSComboBoxControl::RemoveItem(int pos)
 {
 
 void wxNSComboBoxControl::RemoveItem(int pos)
 {

+    SendEvents(false);

     [m_comboBox removeItemAtIndex:pos];
     [m_comboBox removeItemAtIndex:pos];

+    SendEvents(true);

 }
 
 void wxNSComboBoxControl::Clear()
 {
 }
 
 void wxNSComboBoxControl::Clear()
 {

+    SendEvents(false);

     [m_comboBox removeAllItems];
     [m_comboBox removeAllItems];

+    SendEvents(true);

 }
 
 wxString wxNSComboBoxControl::GetStringAtIndex(int pos) const
 }
 
 wxString wxNSComboBoxControl::GetStringAtIndex(int pos) const


@@ -137,11 +143,13 @@ wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxWindowMac* wxpeer,
                                     wxMenu* menu,
                                     const wxPoint& pos, 
                                     const wxSize& size,
                                     wxMenu* menu,
                                     const wxPoint& pos, 
                                     const wxSize& size,

-                                    long WXUNUSED(style), 
+                                    long style, 

                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSComboBox* v = [[wxNSComboBox alloc] initWithFrame:r];
                                     long WXUNUSED(extraStyle))
 {
     NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
     wxNSComboBox* v = [[wxNSComboBox alloc] initWithFrame:r];

+    if (style & wxCB_READONLY)
+        [v setEditable:NO];

     wxNSComboBoxControl* c = new wxNSComboBoxControl( wxpeer, v );
     return c;
 }
     wxNSComboBoxControl* c = new wxNSComboBoxControl( wxpeer, v );
     return c;
 }