proper UTF32 / 16 conversions added

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 2d7dff4fbcea8bdc3ad2b4f73c6e89a2ab90bd6f..128f87af9e213aad8aa0d0d1a7bd9c79af358d47 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -94,7 +94,7 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
         
     case lDrawMsg:
         {
         
     case lDrawMsg:
         {

-            const wxString text = list->m_stringArray[cell.v] ;
+            const wxString linetext = list->m_stringArray[cell.v] ;

             
             //  Save the current clip region, and set the clip region to the area we are about
             //  to draw.
             
             //  Save the current clip region, and set the clip region to the area we are about
             //  to draw.


@@ -105,13 +105,12 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
             ClipRect( drawRect );
             EraseRect( drawRect );
             
             ClipRect( drawRect );
             EraseRect( drawRect );
             

-            wxFontRefData * font = (wxFontRefData*) list->GetFont().GetRefData() ;
-            
-            if ( font )
+            const wxFont& font = list->GetFont();
+            if ( font.Ok() )

             {
             {

-                ::TextFont( font->m_macFontNum ) ;
-                ::TextSize( short(font->m_macFontSize) ) ;
-                ::TextFace( font->m_macFontStyle ) ;
+                ::TextFont( font.GetMacFontNum() ) ;
+                ::TextSize( font.GetMacFontSize() ) ;
+                ::TextFace( font.GetMacFontStyle() ) ;

             }
             else
             {
             }
             else
             {


@@ -121,32 +120,27 @@ static pascal void wxMacListDefinition( short message, Boolean isSelected, Rect
             }
             
 #if TARGET_CARBON
             }
             
 #if TARGET_CARBON

-            bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
-            
-               if ( useDrawThemeText )
-               {
-                Rect frame = { drawRect->top, drawRect->left + 4,
-                    drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
-                CFStringRef sString = CFStringCreateWithBytes( NULL , (UInt8*) text.c_str(), text.Length(), CFStringGetSystemEncoding(), false ) ;
-                CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , sString ) ;
-                CFRelease( sString ) ;
-                ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
-                ::DrawThemeTextBox( mString,
-                    kThemeCurrentPortFont,
-                    kThemeStateActive,
-                    false,
-                    &frame,
-                    teJustLeft,
-                    nil );
-                CFRelease( mString ) ;
-            }
-            else
-#endif
-            {
+                       {
+                               Rect frame = { drawRect->top, drawRect->left + 4,
+                                   drawRect->top + kwxMacListItemHeight, drawRect->right + 10000 } ;
+                               CFMutableStringRef mString = CFStringCreateMutableCopy( NULL , 0 , wxMacCFStringHolder(linetext , list->GetFont().GetEncoding()) ) ;
+                               ::TruncateThemeText( mString , kThemeCurrentPortFont, kThemeStateActive, drawRect->right - drawRect->left , truncEnd , NULL ) ;
+                               ::DrawThemeTextBox( mString,
+                                   kThemeCurrentPortFont,
+                                   kThemeStateActive,
+                                   false,
+                                   &frame,
+                                   teJustLeft,
+                                   nil );
+                               CFRelease( mString ) ;
+                       }
+#else
+            {  
+               wxCharBuffer text = linetext.mb_str( wxConvLocal) ;

                 MoveTo(drawRect->left + 4 , drawRect->top + 10 );
                 MoveTo(drawRect->left + 4 , drawRect->top + 10 );

-                DrawText(text, 0 , text.Length());
+                DrawText(text, 0 , strlen(text) );

             }
             }

-            
+#endif            

             //  If the cell is hilited, do the hilite now. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.
             
             //  If the cell is hilited, do the hilite now. Paint the cell contents with the
             //  appropriate QuickDraw transform mode.
             


@@ -199,6 +193,20 @@ wxListBox::wxListBox()
 
 static ListDefUPP macListDefUPP = NULL ;
 
 
 static ListDefUPP macListDefUPP = NULL ;
 

+bool wxListBox::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 wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxPoint& pos,
                        const wxSize& size,


@@ -207,13 +215,16 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                        const wxValidator& validator,
                        const wxString& name)
 {
                        const wxValidator& validator,
                        const wxString& name)
 {

+    if ( !wxListBoxBase::Create(parent, id, pos, size, style & ~(wxHSCROLL|wxVSCROLL), validator, name) )
+        return false;
+

     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;
 
     Rect bounds ;
     Str255 title ;
     
     m_noItems = 0 ; // this will be increased by our append command
     m_selected = 0;
 
     Rect bounds ;
     Str255 title ;
     

-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, validator , name , &bounds , title ) ;

     
     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;
     
     ListDefSpec listDef;
     listDef.defType = kListDefUserProcType;


@@ -226,7 +237,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;

-    SInt16 fontNum ;

 #if TARGET_CARBON
     GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 #else
 #if TARGET_CARBON
     GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
 #else


@@ -234,8 +244,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     fontSize = 9 ;
     fontStyle = normal ;
 #endif 
     fontSize = 9 ;
     fontStyle = normal ;
 #endif 

-    CopyPascalStringToC( fontName , (char*) fontName ) ;
-    SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , fontName ) ) ;
+    SetFont( wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) ) ) ;

 #if TARGET_CARBON
     Size asize;
 
 #if TARGET_CARBON
     Size asize;
 


@@ -388,15 +397,8 @@ void wxListBox::Delete(int N)
 int wxListBox::DoAppend(const wxString& item)
 {
     int index = m_noItems ;
 int wxListBox::DoAppend(const wxString& item)
 {
     int index = m_noItems ;

-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        m_stringArray.Add( wxMacMakeMacStringFromPC( item ) ) ;
-        m_dataArray.Add( NULL );
-    }
-    else {
-        m_stringArray.Add( item ) ;
-        m_dataArray.Add( NULL );
-    }
+    m_stringArray.Add( item ) ;
+    m_dataArray.Add( NULL );

     m_noItems ++;
     DoSetItemClientData( index , NULL ) ;
     MacAppend( item ) ;
     m_noItems ++;
     DoSetItemClientData( index , NULL ) ;
     MacAppend( item ) ;


@@ -451,47 +453,30 @@ bool wxListBox::HasMultipleSelection() const
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 }
 
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 }
 

-int wxListBox::FindString(const wxString& st) const
+int wxListBox::FindString(const wxString& s) const

 {
 {

-    wxString s ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        s = wxMacMakeMacStringFromPC( st ) ;
-    }
-    else
-        s = st ;

     
     

-    if ( s.Right(1) == "*" )
+    if ( s.Right(1) == wxT("*") )

     {
         wxString search = s.Left( s.Length() - 1 ) ;
         int len = search.Length() ;
         Str255 s1 , s2 ;
     {
         wxString search = s.Left( s.Length() - 1 ) ;
         int len = search.Length() ;
         Str255 s1 , s2 ;

-        
-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) s2 , search.c_str() ) ;
-#else
-        strcpy( (char *) s2 , search.c_str() ) ;
-        c2pstr( (char *) s2 ) ;
-#endif
+        wxMacStringToPascal( search , s2 ) ;

         
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
         
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {

-#if TARGET_CARBON
-            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-#else
-            strcpy( (char *) s1 , m_stringArray[i].Left( len ).c_str() ) ;
-            c2pstr( (char *) s1 ) ;
-#endif
+               wxMacStringToPascal( m_stringArray[i].Left( len ) , s1 ) ;
+

             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }

-        if ( s.Left(1) == "*" && s.Length() > 1 )
+        if ( s.Left(1) == wxT("*") && s.Length() > 1 )

         {
         {

-            s = st ;
-            s.MakeLower() ;
+            wxString st = s ;
+            st.MakeLower() ;

             for ( int i = 0 ; i < m_noItems ; ++i )
             {
             for ( int i = 0 ; i < m_noItems ; ++i )
             {

-                if ( GetString(i).Lower().Matches(s) )
+                if ( GetString(i).Lower().Matches(st) )

                     return i ;
             }
         }
                     return i ;
             }
         }


@@ -501,21 +486,12 @@ int wxListBox::FindString(const wxString& st) const
     {
         Str255 s1 , s2 ;
         
     {
         Str255 s1 , s2 ;
         

-#if TARGET_CARBON
-        c2pstrcpy( (StringPtr) s2 , s.c_str() ) ;
-#else
-        strcpy( (char *) s2 , s.c_str() ) ;
-        c2pstr( (char *) s2 ) ;
-#endif
+        wxMacStringToPascal( s , s2 ) ;

         
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {
         
         for ( int i = 0 ; i < m_noItems ; ++ i )
         {

-#if TARGET_CARBON
-            c2pstrcpy( (StringPtr) s1 , m_stringArray[i].c_str() ) ;
-#else
-            strcpy( (char *) s1 , m_stringArray[i].c_str() ) ;
-            c2pstr( (char *) s1 ) ;
-#endif
+               wxMacStringToPascal( m_stringArray[i] , s1 ) ;
+

             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }
             if ( EqualString( s1 , s2 , false , false ) )
                 return i ;
         }


@@ -535,7 +511,7 @@ void wxListBox::Clear()
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-        "invalid index in wxListBox::SetSelection" );
+        wxT("invalid index in wxListBox::SetSelection") );

     MacSetSelection( N , select ) ;
     GetSelections( m_selectionPreImage ) ;
 }
     MacSetSelection( N , select ) ;
     GetSelections( m_selectionPreImage ) ;
 }


@@ -543,7 +519,7 @@ void wxListBox::SetSelection(int N, bool select)
 bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
 bool wxListBox::IsSelected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,

-        "invalid index in wxListBox::Selected" );
+        wxT("invalid index in wxListBox::Selected") );

     
     return MacIsSelected( N ) ;
 }
     
     return MacIsSelected( N ) ;
 }


@@ -564,7 +540,7 @@ wxClientData *wxListBox::DoGetItemClientObject(int N) const
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-        "invalid index in wxListBox::SetClientData" );
+        wxT("invalid index in wxListBox::SetClientData") );

     
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )
     
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW )


@@ -574,7 +550,7 @@ void wxListBox::DoSetItemClientData(int N, void *Client_data)
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN
         wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
 #endif // wxUSE_OWNER_DRAWN

-    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , "invalid client_data array" ) ;
+    wxASSERT_MSG( m_dataArray.GetCount() >= (size_t) N , wxT("invalid client_data array") ) ;

     
     if ( m_dataArray.GetCount() > (size_t) N )
     {
     
     if ( m_dataArray.GetCount() > (size_t) N )
     {


@@ -606,12 +582,7 @@ int wxListBox::GetSelection() const
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {

-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        return      wxMacMakePCStringFromMac( m_stringArray[N] ) ;
-    }
-    else
-        return m_stringArray[N]  ;
+       return m_stringArray[N]  ;

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)


@@ -633,14 +604,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
 void wxListBox::SetString(int N, const wxString& s)
 {
 
 void wxListBox::SetString(int N, const wxString& s)
 {

-    wxString str ;
-    if( wxApp::s_macDefaultEncodingIsPC )
-    {
-        str = wxMacMakeMacStringFromPC( s )  ;
-    }
-    else
-        str = s ;
-    m_stringArray[N] = str ;
+    m_stringArray[N] = s ;

     MacSet( N , s ) ;
 }
 
     MacSet( N , s ) ;
 }
 


@@ -653,13 +617,11 @@ wxSize wxListBox::DoGetBestSize() const
     {
         wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
         
     {
         wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
         

-        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-        
-        if ( font )
+        if ( m_font.Ok() )

         {
         {

-            ::TextFont( font->m_macFontNum ) ;
-            ::TextSize( short(font->m_macFontSize) ) ;
-            ::TextFace( font->m_macFontStyle ) ;
+            ::TextFont( m_font.GetMacFontNum() ) ;
+            ::TextSize( m_font.GetMacFontSize() ) ;
+            ::TextFace( m_font.GetMacFontStyle() ) ;

         }
         else
         {
         }
         else
         {


@@ -671,7 +633,19 @@ wxSize wxListBox::DoGetBestSize() const
         // Find the widest line
         for(int i = 0; i < GetCount(); i++) {
             wxString str(GetString(i));
         // Find the widest line
         for(int i = 0; i < GetCount(); i++) {
             wxString str(GetString(i));

+        #if wxUSE_UNICODE
+            Point bounds={0,0} ;
+            SInt16 baseline ;
+            ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) ,
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+            wLine = bounds.h ;
+        #else

             wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
             wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;

+        #endif

             lbWidth = wxMax(lbWidth, wLine);
         }
         
             lbWidth = wxMax(lbWidth, wLine);
         }
         


@@ -754,7 +728,7 @@ void wxListBox::MacDelete( int N )
     Refresh();
 }
 
     Refresh();
 }
 

-void wxListBox::MacInsert( int n , const char * text)
+void wxListBox::MacInsert( int n , const wxString& text)

 {
     Cell cell = { 0 , 0 } ;
     cell.v = n ;
 {
     Cell cell = { 0 , 0 } ;
     cell.v = n ;


@@ -763,7 +737,7 @@ void wxListBox::MacInsert( int n , const char * text)
     Refresh();
 }
 
     Refresh();
 }
 

-void wxListBox::MacAppend( const char * text)
+void wxListBox::MacAppend( const wxString& text)

 {
     Cell cell = { 0 , 0 } ;
     cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;
 {
     Cell cell = { 0 , 0 } ;
     cell.v = (**(ListHandle)m_macList).dataBounds.bottom ;


@@ -834,7 +808,7 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     return no_sel ;
 }
 
     return no_sel ;
 }
 

-void wxListBox::MacSet( int n , const char * text )
+void wxListBox::MacSet( int n , const wxString& text )

 {
     // our implementation does not store anything in the list
     // so we just have to redraw
 {
     // our implementation does not store anything in the list
     // so we just have to redraw


@@ -862,7 +836,7 @@ void wxListBox::OnSize( const wxSizeEvent &event)
     LCellSize( pt , (ListHandle)m_macList ) ;
 }
 
     LCellSize( pt , (ListHandle)m_macList ) ;
 }
 

-void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+void wxListBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown))

 {
     Boolean wasDoubleClick = false ;
     long    result ;
 {
     Boolean wasDoubleClick = false ;
     long    result ;


@@ -963,10 +937,14 @@ void wxListBox::OnChar(wxKeyEvent& event)
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
     {
     /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
     else if (event.GetKeyCode() == WXK_ESCAPE || (event.GetKeyCode() == '.' && event.MetaDown() ) )
     {

+       // FIXME: look in ancestors, not just parent.

         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;
         wxWindow* win = GetParent()->FindWindow( wxID_CANCEL ) ;

-        wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
-        new_event.SetEventObject( win );
-        win->GetEventHandler()->ProcessEvent( new_event );
+        if (win)
+        {
+               wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
+               new_event.SetEventObject( win );
+               win->GetEventHandler()->ProcessEvent( new_event );
+       }

     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {
     }
     else if ( event.GetKeyCode() == WXK_TAB )
     {


@@ -1011,11 +989,11 @@ void wxListBox::OnChar(wxKeyEvent& event)
     {
         if ( event.GetTimestamp() > m_lastTypeIn + 60 )
         {
     {
         if ( event.GetTimestamp() > m_lastTypeIn + 60 )
         {

-            m_typeIn = "" ;
+            m_typeIn = wxEmptyString ;

         }
         m_lastTypeIn = event.GetTimestamp() ;
         m_typeIn += (char) event.GetKeyCode() ;
         }
         m_lastTypeIn = event.GetTimestamp() ;
         m_typeIn += (char) event.GetKeyCode() ;

-        int line = FindString("*"+m_typeIn+"*") ;
+        int line = FindString(wxT("*")+m_typeIn+wxT("*")) ;

         if ( line >= 0 )
         {
             if ( GetSelection() != line )
         if ( line >= 0 )
         {
             if ( GetSelection() != line )