int warning

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

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 32b80d290cf6579e48f15fb2a7aa1023cbd17cee..fff4f2e43a18771a68343335469a6759cc415dfb 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.cpp
-// Purpose:     wxComboBox class
+// Name:        src/mac/carbon/combobxc.cpp
+// Purpose:     wxComboBox class using HIView ComboBox

 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01


@@ -12,8 +12,12 @@
 #include "wx/wxprec.h"
 
 #include "wx/combobox.h"
 #include "wx/wxprec.h"
 
 #include "wx/combobox.h"

-#include "wx/button.h"
-#include "wx/menu.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+    #include "wx/menu.h"
+#endif
+

 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__
 #include "wx/mac/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__


@@ -23,34 +27,32 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 

-// composite combobox implementation by Dan "Bud" Keith bud@otsys.com
-

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

-static int nextPopUpMenuId = 1000 ;
+static int nextPopUpMenuId = 1000;

 MenuHandle NewUniqueMenu()
 {
 MenuHandle NewUniqueMenu()
 {

-  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
-  nextPopUpMenuId++ ;
-  return handle ;
+  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" );
+  nextPopUpMenuId++;
+  return handle;

 }
 
 #if USE_HICOMBOBOX
 static const EventTypeSpec eventList[] =
 {
     { kEventClassTextField , kEventTextAccepted } ,
 }
 
 #if USE_HICOMBOBOX
 static const EventTypeSpec eventList[] =
 {
     { kEventClassTextField , kEventTextAccepted } ,

-} ;
+};

 
 static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
 
 static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {

-    OSStatus result = eventNotHandledErr ;
-    wxComboBox* cb = (wxComboBox*) data ;
+    OSStatus result = eventNotHandledErr;
+    wxComboBox* cb = (wxComboBox*) data;

 
 

-    wxMacCarbonEvent cEvent( event ) ;
+    wxMacCarbonEvent cEvent( event );

 
     switch( cEvent.GetClass() )
     {
 
     switch( cEvent.GetClass() )
     {


@@ -65,17 +67,17 @@ static pascal OSStatus wxMacComboBoxEventHandler( EventHandlerCallRef handler ,
                         event.SetEventObject( cb );
                         cb->GetEventHandler()->ProcessEvent( event );
                     }
                         event.SetEventObject( cb );
                         cb->GetEventHandler()->ProcessEvent( event );
                     }

-                    break ;
+                    break;

                 default :
                 default :

-                    break ;
+                    break;

             }
             }

-            break ;
+            break;

         default :
         default :

-            break ;
+            break;

     }
 
 
     }
 
 

-    return result ;
+    return result;

 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacComboBoxEventHandler )
 }
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacComboBoxEventHandler )


@@ -147,7 +149,7 @@ protected:
 
                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {
 
                 wxWindow *parent = GetParent();
                 while( parent && !parent->IsTopLevel() && parent->GetDefaultItem() == NULL ) {

-                    parent = parent->GetParent() ;
+                    parent = parent->GetParent();

                 }
                 if ( parent && parent->GetDefaultItem() )
                 {
                 }
                 if ( parent && parent->GetDefaultItem() )
                 {


@@ -158,7 +160,7 @@ protected:
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);
                         wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
                         event.SetEventObject(def);
                         def->Command(event);

-                        return ;
+                        return;

                     }
                 }
 
                     }
                 }
 


@@ -201,9 +203,9 @@ protected:
     }
     virtual wxSize DoGetBestSize() const
     {
     }
     virtual wxSize DoGetBestSize() const
     {

-        wxSize sz = wxChoice::DoGetBestSize() ;
-        sz.x = POPUPWIDTH ;
-        return sz ;
+        wxSize sz = wxChoice::DoGetBestSize();
+        sz.x = POPUPWIDTH;
+        return sz;

     }
 
 private:
     }
 
 private:


@@ -354,7 +356,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 ;
+    m_macIsUserPane = false;

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


@@ -362,7 +364,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 #if USE_HICOMBOBOX
         return false;
     }
 #if USE_HICOMBOBOX

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size );

     HIRect hiRect;
 
     hiRect.origin.x = 20; //bounds.left;
     HIRect hiRect;
 
     hiRect.origin.x = 20; //bounds.left;


@@ -377,33 +379,33 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     //hiRect.size.height = bounds.bottom - bounds.top;
     //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);
     //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);
     //hiRect.size.height = bounds.bottom - bounds.top;
     //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);
     //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);

-    m_peer = new wxMacControl(this) ;
-    verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, *m_peer ) );
+    m_peer = new wxMacControl(this);
+    verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, m_peer->GetControlRefAddr() ) );

 
 
 
 

-    SetControl32BitMinimum( *m_peer , 0 ) ;
-    SetControl32BitMaximum( *m_peer , 100) ;
+    m_peer->SetMinimum( 0 );
+    m_peer->SetMaximum( 100);

     if ( n > 0 )
     if ( n > 0 )

-        SetControl32BitValue( *m_peer , 1 ) ;
+        m_peer->SetValue( 1 );

 
 

-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate(pos,size);

 
 

-    for ( int i = 0 ; i < n ; i++ )
+    for ( int i = 0; i < n; i++ )

     {
         DoAppend( choices[ i ] );
     }
 
     {
         DoAppend( choices[ i ] );
     }
 

-    HIViewSetVisible( *m_peer, true );
+    HIViewSetVisible( m_peer->GetControlRef(), true );

     SetSelection(0);
     SetSelection(0);

-    EventHandlerRef comboEventHandler ;
-    InstallControlEventHandler( *m_peer, GetwxMacComboBoxEventHandlerUPP(),
+    EventHandlerRef comboEventHandler;
+    InstallControlEventHandler( m_peer->GetControlRef(), GetwxMacComboBoxEventHandlerUPP(),

         GetEventTypeCount(eventList), eventList, this,
         (EventHandlerRef *)&comboEventHandler);
 #else
     m_choice = new wxComboBoxChoice(this, style );
 
     m_choice = new wxComboBoxChoice(this, style );
         GetEventTypeCount(eventList), eventList, this,
         (EventHandlerRef *)&comboEventHandler);
 #else
     m_choice = new wxComboBoxChoice(this, style );
 
     m_choice = new wxComboBoxChoice(this, style );

-    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) ) ;
+    m_choice->SetSizeHints( wxSize( POPUPWIDTH , POPUPHEIGHT ) );

 
     wxSize csize = size;
     if ( style & wxCB_READONLY )
 
     wxSize csize = size;
     if ( style & wxCB_READONLY )


@@ -414,13 +416,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     {
         m_text = new wxComboBoxText(this);
         if ( size.y == wxDefaultCoord ) {
     {
         m_text = new wxComboBoxText(this);
         if ( size.y == wxDefaultCoord ) {

-          csize.y = m_text->GetSize().y ;
+          csize.y = m_text->GetSize().y;

         }
     }
 
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 
         }
     }
 
     DoSetSize(pos.x, pos.y, csize.x, csize.y);
 

-    for ( int i = 0 ; i < n ; i++ )
+    for ( int i = 0; i < n; i++ )

     {
         m_choice->DoAppend( choices[ i ] );
     }
     {
         m_choice->DoAppend( choices[ i ] );
     }


@@ -434,7 +436,7 @@ wxString wxComboBox::GetValue() const
 {
 #if USE_HICOMBOBOX
     CFStringRef myString;
 {
 #if USE_HICOMBOBOX
     CFStringRef myString;

-    HIComboBoxCopyTextItemAtIndex( *m_peer, (CFIndex)GetSelection(), &myString );
+    HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString );

     return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
 #else
     wxString        result;
     return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
 #else
     wxString        result;


@@ -460,9 +462,9 @@ void wxComboBox::SetValue(const wxString& value)
     int s = FindString (value);
     if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
     {
     int s = FindString (value);
     if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
     {

-        m_choice->Append(value) ;
+        m_choice->Append(value);

     }
     }

-    SetStringSelection( value ) ;
+    SetStringSelection( value );

 #endif
 }
 
 #endif
 }
 


@@ -553,87 +555,87 @@ int wxComboBox::DoAppend(const wxString& item)
 {
 #if USE_HICOMBOBOX
     CFIndex outIndex;
 {
 #if USE_HICOMBOBOX
     CFIndex outIndex;

-    HIComboBoxAppendTextItem( *m_peer, wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex );
-    //SetControl32BitMaximum( *m_peer, GetCount() );
+    HIComboBoxAppendTextItem( m_peer->GetControlRef(), wxMacCFStringHolder( item, m_font.GetEncoding() ), &outIndex );
+    //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() );

     return (int) outIndex;
 #else
     return (int) outIndex;
 #else

-    return m_choice->DoAppend( item ) ;
+    return m_choice->DoAppend( item );

 #endif
 }
 
 #endif
 }
 

-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );
+    HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)pos, wxMacCFStringHolder(item, m_font.GetEncoding()) );

 
 

-    //SetControl32BitMaximum( *m_peer, GetCount() );
+    //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() );

 
     return pos;
 #else
 
     return pos;
 #else

-    return m_choice->DoInsert( item , pos ) ;
+    return m_choice->DoInsert( item , pos );

 #endif
 }
 
 #endif
 }
 

-void wxComboBox::DoSetItemClientData(int n, void* clientData)
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)

 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else
 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else

-    return m_choice->DoSetItemClientData( n , clientData ) ;
+    return m_choice->DoSetItemClientData( n , clientData );

 #endif
 }
 
 #endif
 }
 

-void* wxComboBox::DoGetItemClientData(int n) const
+void* wxComboBox::DoGetItemClientData(unsigned int n) const

 {
 #if USE_HICOMBOBOX
     return NULL; //TODO
 #else
 {
 #if USE_HICOMBOBOX
     return NULL; //TODO
 #else

-    return m_choice->DoGetItemClientData( n ) ;
+    return m_choice->DoGetItemClientData( n );

 #endif
 }
 
 #endif
 }
 

-void wxComboBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else
 {
 #if USE_HICOMBOBOX
     return; //TODO
 #else

-    return m_choice->DoSetItemClientObject( n , clientData ) ;
+    return m_choice->DoSetItemClientObject( n , clientData );

 #endif
 }
 
 #endif
 }
 

-wxClientData* wxComboBox::DoGetItemClientObject(int n) const
+wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const

 {
 #if USE_HICOMBOBOX
     return NULL;
 #else
 {
 #if USE_HICOMBOBOX
     return NULL;
 #else

-    return m_choice->DoGetItemClientObject( n ) ;
+    return m_choice->DoGetItemClientObject( n );

 #endif
 }
 
 void wxComboBox::FreeData()
 {
 #endif
 }
 
 void wxComboBox::FreeData()
 {

-    if ( HasClientObjectData() )
+    if (HasClientObjectData())

     {
     {

-        size_t count = GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )

         {
             SetClientObject( n, NULL );
         }
     }
 }
 
         {
             SetClientObject( n, NULL );
         }
     }
 }
 

-int wxComboBox::GetCount() const {
+unsigned int wxComboBox::GetCount() const {

 #if USE_HICOMBOBOX
 #if USE_HICOMBOBOX

-    return (int) HIComboBoxGetItemCount( *m_peer );
+    return (unsigned int) HIComboBoxGetItemCount( m_peer->GetControlRef() );

 #else
 #else

-    return m_choice->GetCount() ;
+    return m_choice->GetCount();

 #endif
 }
 
 #endif
 }
 

-void wxComboBox::Delete(int n)
+void wxComboBox::Delete(unsigned int n)

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex)n );
+    HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex)n );

 #else
     // force client object deletion
     if( HasClientObjectData() )
 #else
     // force client object deletion
     if( HasClientObjectData() )


@@ -646,8 +648,8 @@ void wxComboBox::Clear()
 {
     FreeData();
 #if USE_HICOMBOBOX
 {
     FreeData();
 #if USE_HICOMBOBOX

-    for ( CFIndex i = GetCount() - 1 ; i >= 0 ; ++ i )
-        verify_noerr( HIComboBoxRemoveItemAtIndex( *m_peer, i ) );
+    for ( CFIndex i = GetCount() - 1; i >= 0; ++ i )
+        verify_noerr( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), i ) );

     m_peer->SetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag,CFSTR(""));
 #else
     m_choice->Clear();
     m_peer->SetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag,CFSTR(""));
 #else
     m_choice->Clear();


@@ -657,7 +659,7 @@ void wxComboBox::Clear()
 int wxComboBox::GetSelection() const
 {
 #if USE_HICOMBOBOX
 int wxComboBox::GetSelection() const
 {
 #if USE_HICOMBOBOX

-    return FindString( GetStringSelection() ) ;
+    return FindString( GetStringSelection() );

 #else
     return m_choice->GetSelection();
 #endif
 #else
     return m_choice->GetSelection();
 #endif


@@ -666,36 +668,36 @@ int wxComboBox::GetSelection() const
 void wxComboBox::SetSelection(int n)
 {
 #if USE_HICOMBOBOX
 void wxComboBox::SetSelection(int n)
 {
 #if USE_HICOMBOBOX

-    SetControl32BitValue( *m_peer , n + 1 ) ;
+    SetControl32BitValue( m_peer->GetControlRef() , n + 1 );

 #else
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
     {
 #else
     m_choice->SetSelection( n );
 
     if ( m_text != NULL )
     {

-        m_text->SetValue( GetString( n ) );
+        m_text->SetValue(GetString(n));

     }
 #endif
 }
 
     }
 #endif
 }
 

-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool bCase) const

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    for( int i = 0 ; i < GetCount() ; i++ )
+    for( unsigned int i = 0 ; i < GetCount() ; i++ )

     {
     {

-        if ( GetString( i ).IsSameAs(s, false) )
+        if (GetString(i).IsSameAs(s, bCase) )

             return i ;
     }
             return i ;
     }

-    return wxNOT_FOUND ;
+    return wxNOT_FOUND;

 #else
 #else

-    return m_choice->FindString( s );
+    return m_choice->FindString( s, bCase );

 #endif
 }
 
 #endif
 }
 

-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
 #if USE_HICOMBOBOX
     CFStringRef itemText;
 {
 #if USE_HICOMBOBOX
     CFStringRef itemText;

-    HIComboBoxCopyTextItemAtIndex( *m_peer, (CFIndex)n, &itemText );
+    HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)n, &itemText );

     return wxMacCFStringHolder(itemText).AsString();
 #else
     return m_choice->GetString( n );
     return wxMacCFStringHolder(itemText).AsString();
 #else
     return m_choice->GetString( n );


@@ -705,24 +707,24 @@ wxString wxComboBox::GetString(int n) const
 wxString wxComboBox::GetStringSelection() const
 {
 #if USE_HICOMBOBOX
 wxString wxComboBox::GetStringSelection() const
 {
 #if USE_HICOMBOBOX

-    return wxMacCFStringHolder(m_peer->GetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString() ;
+    return wxMacCFStringHolder(m_peer->GetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString();

 #else
     int sel = GetSelection ();
 #else
     int sel = GetSelection ();

-    if (sel > -1)
-        return wxString(this->GetString (sel));
+    if (sel != wxNOT_FOUND)
+        return wxString(this->GetString((unsigned int)sel));

     else
         return wxEmptyString;
 #endif
 }
 
     else
         return wxEmptyString;
 #endif
 }
 

-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(unsigned int n, const wxString& s)

 {
 #if USE_HICOMBOBOX
 {
 #if USE_HICOMBOBOX

-    verify_noerr ( HIComboBoxInsertTextItemAtIndex( *m_peer, (CFIndex) n,
+    verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n,

         wxMacCFStringHolder(s, m_font.GetEncoding()) ) );
         wxMacCFStringHolder(s, m_font.GetEncoding()) ) );

-    verify_noerr ( HIComboBoxRemoveItemAtIndex( *m_peer, (CFIndex) n + 1 ) );
+    verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) );

 #else
 #else

-    m_choice->SetString( n , s ) ;
+    m_choice->SetString( n , s );

 #endif
 }
 
 #endif
 }
 


@@ -838,5 +840,5 @@ wxInt32 wxComboBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);
     event.SetEventObject(this);
     event.SetString(GetStringSelection());
     ProcessCommand(event);

-    return noErr ;
+    return noErr;

 }
 }