removed duplicate wxTheApp and m_appInitFn definitions from all ports, not just MSW

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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 4074699ed54cc289279b2fa67c6b2513920bc27d..86d75eb0da14405232ad9e54bc81eb293ff67f50 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -6,19 +6,24 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:    wxWindows licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

+

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

+

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

+

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif

+

 extern MenuHandle NewUniqueMenu() ;
 extern MenuHandle NewUniqueMenu() ;

+

 wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )
 wxChoice::~wxChoice()
 {
     if ( HasClientObjectData() )


@@ -30,49 +35,68 @@ wxChoice::~wxChoice()
     }
 
         // DeleteMenu( m_macPopUpMenuId ) ;
     }
 
         // DeleteMenu( m_macPopUpMenuId ) ;

-       // DisposeMenu( m_macPopUpMenuHandle ) ;
+    // DisposeMenu( m_macPopUpMenuHandle ) ;

 }
 }

+

 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,

-                  int n, const wxString choices[],
-                  long style,
+           int n, const wxString choices[],
+           long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-               Rect bounds ;
-               Str255 title ;
-       
-               MacPreControlCreate( parent , id ,  "" , 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() ;
-               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() ;
+    Rect bounds ;
+    Str255 title ;
+
+    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() ;
+    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() ;

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

-       return TRUE;
+    return TRUE;

 }
 }

+

 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 int wxChoice::DoAppend(const wxString& item)
 {
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 int wxChoice::DoAppend(const wxString& item)
 {

-       UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
-       m_strings.Add( item ) ;
-       m_datas.Add( NULL ) ;
-       int index = m_strings.GetCount()  - 1  ;
-       DoSetItemClientData( index , NULL ) ;
-       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
-       return index ;
+    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
+    m_strings.Add( item ) ;
+    m_datas.Add( NULL ) ;
+    int index = m_strings.GetCount()  - 1  ;
+    DoSetItemClientData( index , NULL ) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+    return index ;

 }
 }

+
+int wxChoice::DoInsert(const wxString& item, int pos)
+{
+    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+
+    if (pos == GetCount())
+        return DoAppend(item);
+
+    UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item);
+    m_strings.Insert( item, pos ) ;
+    m_datas.Insert( NULL, pos ) ;
+    DoSetItemClientData( pos , NULL ) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , pos) ;
+    return pos ;
+}
+

 void wxChoice::Delete(int n)
 {
     wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
 void wxChoice::Delete(int n)
 {
     wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );


@@ -83,19 +107,21 @@ void wxChoice::Delete(int n)
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.RemoveAt( n ) ;
     ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.RemoveAt( n ) ;

-       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;

 }
 }

+

 void wxChoice::Clear()
 {
     FreeData();
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
 void wxChoice::Clear()
 {
     FreeData();
     for ( int i = 0 ; i < GetCount() ; i++ )
     {

-       ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;

     }
     m_strings.Empty() ;
     m_datas.Empty() ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
 }
     }
     m_strings.Empty() ;
     m_datas.Empty() ;
     SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
 }

+

 void wxChoice::FreeData()
 {
     if ( HasClientObjectData() )
 void wxChoice::FreeData()
 {
     if ( HasClientObjectData() )


@@ -107,6 +133,7 @@ void wxChoice::FreeData()
         }
     }
 }
         }
     }
 }

+

 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------


@@ -114,26 +141,31 @@ int wxChoice::GetSelection() const
 {
     return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
 }
 {
     return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
 }

+

 void wxChoice::SetSelection(int n)
 {
     SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
 }
 void wxChoice::SetSelection(int n)
 {
     SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
 }

+

 // ----------------------------------------------------------------------------
 // string list functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // string list functions
 // ----------------------------------------------------------------------------

+

 int wxChoice::GetCount() const
 {
     return m_strings.GetCount() ;
 }
 int wxChoice::GetCount() const
 {
     return m_strings.GetCount() ;
 }

+

 int wxChoice::FindString(const wxString& s) const
 {
     for( int i = 0 ; i < GetCount() ; i++ )
     {
 int wxChoice::FindString(const wxString& s) const
 {
     for( int i = 0 ; i < GetCount() ; i++ )
     {

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

     }
     return wxNOT_FOUND ;
 }
     }
     return wxNOT_FOUND ;
 }

+

 void wxChoice::SetString(int n, const wxString& s)
 {
     wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
 void wxChoice::SetString(int n, const wxString& s)
 {
     wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));


@@ -145,7 +177,7 @@ void wxChoice::SetString(int n, const wxString& s)
 
 wxString wxChoice::GetString(int n) const
 {
 
 wxString wxChoice::GetString(int n) const
 {

-       return m_strings[n] ;
+    return m_strings[n] ;

 }
 // ----------------------------------------------------------------------------
 // client data
 }
 // ----------------------------------------------------------------------------
 // client data


@@ -153,25 +185,29 @@ wxString wxChoice::GetString(int n) const
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
     wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
     wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),

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

     m_datas[n] = (char*) clientData ;
 }
     m_datas[n] = (char*) clientData ;
 }

+

 void *wxChoice::DoGetItemClientData(int n) const
 {
     wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
 void *wxChoice::DoGetItemClientData(int n) const
 {
     wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,

-                 "invalid index in wxChoice::GetClientData" );
+                 wxT("invalid index in wxChoice::GetClientData") );

     return (void *)m_datas[n];
 }
     return (void *)m_datas[n];
 }

+

 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 {
     DoSetItemClientData(n, clientData);
 }
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
 {
     DoSetItemClientData(n, clientData);
 }

+

 wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 {
     return (wxClientData *)DoGetItemClientData(n);
 }
 wxClientData* wxChoice::DoGetItemClientObject( int n ) const
 {
     return (wxClientData *)DoGetItemClientData(n);
 }

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

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


@@ -188,45 +224,57 @@ void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
         ProcessCommand(event);
     }
 }
         ProcessCommand(event);
     }
 }

+

 wxSize wxChoice::DoGetBestSize() const
 {
 wxSize wxChoice::DoGetBestSize() const
 {

-    int lbWidth = 100;  // some defaults
+    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults

     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON
     long metric ;
     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON
     long metric ;

-    GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );   
-    lbHeight = metric ; 
+    GetThemeMetric(kThemeMetricPopupButtonHeight , &metric );
+    lbHeight = metric ;

 #endif
 #endif

-       {
-               wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ; 
-               Rect drawRect ;
-               wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-               if ( font )
-               {
-                       ::TextFont( font->m_macFontNum ) ;
-                       ::TextSize( short(font->m_macFontSize) ) ;
-                       ::TextFace( font->m_macFontStyle ) ;
-               }
-               else
-               {
-               ::TextFont( kFontIDMonaco ) ;
-               ::TextSize( 9  );
-               ::TextFace( 0 ) ;
-               }
-           // Find the widest line
-           for(int i = 0; i < GetCount(); i++) {
-               wxString str(GetString(i));
-               wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
-               lbWidth = wxMax(lbWidth, wLine);
-           }
-           // Add room for the popup arrow
-           lbWidth += 2 * lbHeight ;
-           // And just a bit more
-           int cy = 12 ;
-           int cx = ::TextWidth( "X" , 0 , 1 ) ;
-           lbWidth += cx ;
-           
-       }
+    {
+        wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
+        wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+        if ( font )
+        {
+            ::TextFont( font->m_macFontNum ) ;
+            ::TextSize( short(font->m_macFontSize) ) ;
+            ::TextFace( font->m_macFontStyle ) ;
+        }
+        else
+        {
+            ::TextFont( kFontIDMonaco ) ;
+            ::TextSize( 9  );
+            ::TextFace( 0 ) ;
+        }
+        // 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 ) ,
+                kThemeCurrentPortFont,
+                kThemeStateActive,
+                false,
+                &bounds,
+                &baseline );
+            wLine = bounds.h ;
+        #else
+            wxCharBuffer text = wxMacStringToCString( str ) ;
+            wLine = ::TextWidth( text , 0 , strlen(text) ) ;
+        #endif
+            lbWidth = wxMax(lbWidth, wLine);
+        }
+        // Add room for the popup arrow
+        lbWidth += 2 * lbHeight ;
+        // And just a bit more
+        int cx = ::TextWidth( "X" , 0 , 1 ) ;
+        lbWidth += cx ;
+
+    }

     return wxSize(lbWidth, lbHeight);
 }
     return wxSize(lbWidth, lbHeight);
 }