24x24 bitmaps and separator for flat style added

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index c963dcad3271faf238ae96a51b3ea303e50c752a..548eee9e53d915b12769cbcb69f876c8afda9acd 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -9,11 +9,14 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "choice.h"
 #endif
 
 #pragma implementation "choice.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE
+

 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 #include "wx/choice.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"


@@ -38,6 +41,20 @@ wxChoice::~wxChoice()
     // DisposeMenu( m_macPopUpMenuHandle ) ;
 }
 
     // DisposeMenu( m_macPopUpMenuHandle ) ;
 }
 

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

 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,


@@ -46,29 +63,29 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    m_macIsUserPane = false ;
+

     if ( !wxChoiceBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxChoiceBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    Rect bounds ;
-    Str255 title ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreatePopupButtonControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , CFSTR("") ,
+        -12345 , false /* no variable width */ , 0 , 0 , 0 , m_peer->GetControlRefAddr() ) );

 
 

-    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 ,
-        kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ;

 
     m_macPopUpMenuHandle =  NewUniqueMenu() ;
 
     m_macPopUpMenuHandle =  NewUniqueMenu() ;

-    SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
-    SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
-    SetControl32BitMaximum( (ControlHandle) m_macControl , 0) ;
-    if ( n > 0 )
-        SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;
-    MacPostControlCreate() ;
+    m_peer->SetData<MenuHandle>( kControlNoPart , kControlPopupButtonMenuHandleTag , (MenuHandle) m_macPopUpMenuHandle ) ;
+    m_peer->SetValueAndRange( n > 0 ? 1 : 0 , 0 , 0 ) ;
+    MacPostControlCreate(pos,size) ;

     // TODO wxCB_SORT
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
     }
     // TODO wxCB_SORT
     for ( int i = 0; i < n; i++ )
     {
         Append(choices[i]);
     }

-    return TRUE;
+    SetBestSize(size);   // Needed because it is a wxControlWithItems
+    return true;

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


@@ -76,12 +93,12 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 // ----------------------------------------------------------------------------
 int wxChoice::DoAppend(const wxString& item)
 {
 // ----------------------------------------------------------------------------
 int wxChoice::DoAppend(const wxString& item)
 {

-    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
+    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() );

     m_strings.Add( item ) ;
     m_datas.Add( NULL ) ;
     int index = m_strings.GetCount()  - 1  ;
     DoSetItemClientData( index , NULL ) ;
     m_strings.Add( item ) ;
     m_datas.Add( NULL ) ;
     int index = m_strings.GetCount()  - 1  ;
     DoSetItemClientData( index , NULL ) ;

-    SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+    m_peer->SetMaximum( GetCount() ) ;

     return index ;
 }
 
     return index ;
 }
 


@@ -93,11 +110,11 @@ int wxChoice::DoInsert(const wxString& item, int pos)
     if (pos == GetCount())
         return DoAppend(item);
 
     if (pos == GetCount())
         return DoAppend(item);
 

-    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
+    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() );

     m_strings.Insert( item, pos ) ;
     m_datas.Insert( NULL, pos ) ;
     DoSetItemClientData( pos , NULL ) ;
     m_strings.Insert( item, pos ) ;
     m_datas.Insert( NULL, pos ) ;
     DoSetItemClientData( pos , NULL ) ;

-    SetControl32BitMaximum( (ControlHandle) m_macControl , pos) ;
+    m_peer->SetMaximum( GetCount() ) ;

     return pos ;
 }
 
     return pos ;
 }
 


@@ -111,7 +128,7 @@ void wxChoice::Delete(int n)
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.RemoveAt( n ) ;
     m_datas.RemoveAt( n ) ;

-    SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+    m_peer->SetMaximum( GetCount() ) ;

 }
 
 void wxChoice::Clear()
 }
 
 void wxChoice::Clear()


@@ -123,7 +140,7 @@ void wxChoice::Clear()
     }
     m_strings.Empty() ;
     m_datas.Empty() ;
     }
     m_strings.Empty() ;
     m_datas.Empty() ;

-    SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
+    m_peer->SetMaximum( 0 ) ;

 }
 
 void wxChoice::FreeData()
 }
 
 void wxChoice::FreeData()


@@ -143,12 +160,12 @@ void wxChoice::FreeData()
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {
 // ----------------------------------------------------------------------------
 int wxChoice::GetSelection() const
 {

-    return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
+    return m_peer->GetValue() -1 ;

 }
 
 void wxChoice::SetSelection(int n)
 {
 }
 
 void wxChoice::SetSelection(int n)
 {

-    SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
+    m_peer->SetValue( n + 1 ) ;

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


@@ -164,7 +181,7 @@ int wxChoice::FindString(const wxString& s) const
 {
     for( int i = 0 ; i < GetCount() ; i++ )
     {
 {
     for( int i = 0 ; i < GetCount() ; i++ )
     {

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

             return i ;
     }
     return wxNOT_FOUND ;
             return i ;
     }
     return wxNOT_FOUND ;


@@ -215,7 +232,7 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
     return (wxClientData *)DoGetItemClientData(n);
 }
 
     return (wxClientData *)DoGetItemClientData(n);
 }
 

-void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 
+wxInt32 wxChoice::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
     int n = GetSelection();
 {
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
     int n = GetSelection();


@@ -231,6 +248,7 @@ void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart , b
             event.SetClientData( GetClientData(n) );
         ProcessCommand(event);
     }
             event.SetClientData( GetClientData(n) );
         ProcessCommand(event);
     }

+    return noErr ;

 }
 
 wxSize wxChoice::DoGetBestSize() const
 }
 
 wxSize wxChoice::DoGetBestSize() const


@@ -244,13 +262,12 @@ wxSize wxChoice::DoGetBestSize() const
     lbHeight = metric ;
 #endif
     {
     lbHeight = metric ;
 #endif
     {

-        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
-        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-        if ( font )
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetTopLevelWindowRef() ) ) ;
+        if ( m_font.Ok() )

         {
         {

-            ::TextFont( font->m_macFontNum ) ;
-            ::TextSize( short(font->m_macFontSize) ) ;
-            ::TextFace( font->m_macFontStyle ) ;
+            ::TextFont( m_font.MacGetFontNum() ) ;
+            ::TextSize( m_font.MacGetFontSize() ) ;
+            ::TextFace( m_font.MacGetFontStyle() ) ;

         }
         else
         {
         }
         else
         {


@@ -264,7 +281,7 @@ wxSize wxChoice::DoGetBestSize() const
         #if wxUSE_UNICODE
             Point bounds={0,0} ;
             SInt16 baseline ;
         #if wxUSE_UNICODE
             Point bounds={0,0} ;
             SInt16 baseline ;

-            ::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,

                 kThemeCurrentPortFont,
                 kThemeStateActive,
                 false,
                 kThemeCurrentPortFont,
                 kThemeStateActive,
                 false,


@@ -285,3 +302,5 @@ wxSize wxChoice::DoGetBestSize() const
     }
     return wxSize(lbWidth, lbHeight);
 }
     }
     return wxSize(lbWidth, lbHeight);
 }

+
+#endif // wxUSE_CHOICE