define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp...

[wxWidgets.git] / src / osx / carbon / utils.cpp

diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp
index a1015f90c20d5768c8ab30adc1784a24d70695bc..867ee80336278947cd34e4d51f1d4e95276829fe 100644 (file)
--- a/src/osx/carbon/utils.cpp
+++ b/src/osx/carbon/utils.cpp
@@ -62,7 +62,7 @@ void wxBell()
     else
 #endif
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
     else
 #endif
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

-        SysBeep(30);
+        AlertSoundPlay();

 #else
     {
     }
 #else
     {
     }


@@ -144,8 +144,17 @@ wxString wxMacFindFolder( short        vol,
 
 #endif // wxUSE_BASE
 
 
 #endif // wxUSE_BASE
 

+
+// ============================================================================
+// GUI-only functions from now on
+// ============================================================================
+

 #if wxUSE_GUI
 
 #if wxUSE_GUI
 

+// ----------------------------------------------------------------------------
+// Miscellaneous functions
+// ----------------------------------------------------------------------------
+

 void wxGetMousePosition( int* x, int* y )
 {
     Point pt;
 void wxGetMousePosition( int* x, int* y )
 {
     Point pt;


@@ -259,27 +268,6 @@ void wxMacNativeToPoint( const Point *n , wxPoint* wx )
     wx->y = n->v;
 }
 
     wx->y = n->v;
 }
 

-//---------------------------------------------------------------------------
-// wxMac Specific string utility functions
-//---------------------------------------------------------------------------
-
-void wxMacStringToPascal( const wxString&from , StringPtr to )
-{
-    wxCharBuffer buf = from.mb_str( wxConvLocal );
-    int len = strlen(buf);
-
-    if ( len > 255 )
-        len = 255;
-    to[0] = len;
-    memcpy( (char*) &to[1] , buf , len );
-}
-
-wxString wxMacMakeStringFromPascal( ConstStringPtr from )
-{
-    return wxString( (char*) &from[1] , wxConvLocal , from[0] );
-}
-
-

 // ----------------------------------------------------------------------------
 // Carbon Event Support
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Carbon Event Support
 // ----------------------------------------------------------------------------


@@ -700,11 +688,10 @@ bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *WXUNUSED(owner) ,
     const wxMacDataItem* rhs,
     DataBrowserPropertyID sortProperty) const
 {
     const wxMacDataItem* rhs,
     DataBrowserPropertyID sortProperty) const
 {

-    const wxMacDataItem* otherItem = wx_const_cast(wxMacDataItem*,rhs);

     bool retval = false;
 
     if ( sortProperty == kNumericOrderColumnId )
     bool retval = false;
 
     if ( sortProperty == kNumericOrderColumnId )

-        retval = m_order < otherItem->m_order;
+        retval = m_order < rhs->m_order;

 
     return retval;
 }
 
     return retval;
 }


@@ -1059,10 +1046,9 @@ void wxMacDataItemBrowserControl::MacDelete( unsigned int n )
 
 void wxMacDataItemBrowserControl::MacInsert( unsigned int n, wxMacDataItem* item)
 {
 
 void wxMacDataItemBrowserControl::MacInsert( unsigned int n, wxMacDataItem* item)
 {

-    SInt32 frontLineOrder = 0;
-

     if ( m_sortOrder == SortOrder_None )
     {
     if ( m_sortOrder == SortOrder_None )
     {

+        

         // increase the order of the lines to be shifted
         unsigned int lines = MacGetCount();
         for ( unsigned int i = n; i < lines; ++i)
         // increase the order of the lines to be shifted
         unsigned int lines = MacGetCount();
         for ( unsigned int i = n; i < lines; ++i)


@@ -1070,22 +1056,21 @@ void wxMacDataItemBrowserControl::MacInsert( unsigned int n, wxMacDataItem* item
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
             iter->SetOrder( iter->GetOrder() + 1 );
         }
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(i);
             iter->SetOrder( iter->GetOrder() + 1 );
         }

+     
+#if 0
+        // I don't understand what this code is supposed to do, RR.
+        SInt32 frontLineOrder = 0;

         if ( n > 0 )
         {
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);
         if ( n > 0 )
         {
             wxMacDataItem* iter = (wxMacDataItem*) GetItemFromLine(n-1);

-            frontLineOrder = iter->GetOrder();
+            frontLineOrder = iter->GetOrder()+1;

         }
         }

+#else   
+        item->SetOrder( n );
+#endif

     }
 
     }
 

-    wxArrayMacDataItemPtr ids;
-    ids.SetCount( 1 );
-
-    if ( m_sortOrder == SortOrder_None )
-        item->SetOrder( frontLineOrder + 1 );
-
-    ids[0] = item;
-
-    AddItems( wxMacDataBrowserRootContainer, ids );
+    AddItem( wxMacDataBrowserRootContainer, item );

 }
 
 void wxMacDataItemBrowserControl::MacClear()
 }
 
 void wxMacDataItemBrowserControl::MacClear()