added missing return type (implicit int no longer accepted by compilers)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 153c750c4476b660df8e9d4026eb57b286702cde..5ffdf549559f5d8ad3450b5af12345859576dd08 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -41,7 +41,7 @@ void wxMacCtoPString(const char* theCString, Str255 thePString);
 
 // remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
 
 
 // remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
 

-wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )
+int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )

 {
        char *p = (char *) &outMacItemText[1] ;
        short macModifiers = 0 ;
 {
        char *p = (char *) &outMacItemText[1] ;
        short macModifiers = 0 ;

diff --git a/src/mac/menuitem.cpp b/src/mac/menuitem.cpp
index 153c750c4476b660df8e9d4026eb57b286702cde..5ffdf549559f5d8ad3450b5af12345859576dd08 100644 (file)
--- a/src/mac/menuitem.cpp
+++ b/src/mac/menuitem.cpp
@@ -41,7 +41,7 @@ void wxMacCtoPString(const char* theCString, Str255 thePString);
 
 // remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
 
 
 // remove inappropriate characters, if useShortcuts is false, the ampersand will not auto-generate a mac menu-shortcut
 

-wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )
+int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShortcutChar , UInt8 *outMacModifiers , const char *inItemText , bool useShortcuts )

 {
        char *p = (char *) &outMacItemText[1] ;
        short macModifiers = 0 ;
 {
        char *p = (char *) &outMacItemText[1] ;
        short macModifiers = 0 ;