need to overload assertEquals(int,short) too to resolve ambiguity

[wxWidgets.git] / include / wx / osx / carbon / uma.h

diff --git a/include/wx/osx/carbon/uma.h b/include/wx/osx/carbon/uma.h
index 78a34d3fa318adb6d63feb02875f319d18f4a660..00477c6b25aaedaed6fabb758d3a62f401d51331 100644 (file)
--- a/include/wx/osx/carbon/uma.h
+++ b/include/wx/osx/carbon/uma.h
@@ -12,10 +12,7 @@
 #ifndef H_UMA
 #define H_UMA
 
-#include "wx/mac/private.h"
-
-void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
-long UMAGetSystemVersion() ;
+#include "wx/osx/private.h"
 
 #if wxUSE_GUI
 
@@ -25,8 +22,6 @@ MenuRef         UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding e
 void             UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) ;
 void             UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
 
-void            UMAAppendSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , SInt16 submenuid ) ;
-void            UMAInsertSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , MenuItemIndex item , SInt16 submenuid ) ;
 void            UMAAppendMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , wxAcceleratorEntry *entry = NULL  ) ;
 void            UMAInsertMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry = NULL ) ;
 void             UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) ;