#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/cmndata.h"
#endif
-#include "wx/cmndata.h"
#include "wx/fontutil.h"
// ============================================================================
{
[super initWithFrame:rectBox];
- wxMacCFStringHolder cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() );
- wxMacCFStringHolder cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() );
+ wxCFStringRef cfOkString( wxT("OK"), wxLocale::GetSystemEncoding() );
+ wxCFStringRef cfCancelString( wxT("Cancel"), wxLocale::GetSystemEncoding() );
NSRect rectCancel = NSMakeRect( 10.0 , 10.0 , 82 , 24 );
NSRect rectOK = NSMakeRect( 100.0 , 10.0 , 82 , 24 );
NSButton* cancelButton = [[NSButton alloc] initWithFrame:rectCancel];
- [cancelButton setTitle:(NSString*)cfCancelString.Detach()];
+ [cancelButton setTitle:(NSString*)wxCFRetain((CFStringRef)cfCancelString)];
[cancelButton setBezelStyle:NSRoundedBezelStyle];
[cancelButton setButtonType:NSMomentaryPushInButton];
[cancelButton setAction:@selector(cancelPressed:)];
m_cancelButton = cancelButton ;
NSButton* okButton = [[NSButton alloc] initWithFrame:rectOK];
- [okButton setTitle:(NSString*)cfOkString.Detach()];
+ [okButton setTitle:(NSString*)wxCFRetain((CFStringRef)cfOkString)];
[okButton setBezelStyle:NSRoundedBezelStyle];
[okButton setButtonType:NSMomentaryPushInButton];
[okButton setAction:@selector(okPressed:)];
- (IBAction)cancelPressed:(id)sender
{
+ wxUnusedVar(sender);
m_shouldClose = YES ;
[NSApp stopModal];
}
- (IBAction)okPressed:(id)sender
{
+ wxUnusedVar(sender);
m_okPressed = YES ;
m_shouldClose = YES ;
[NSApp stopModal];
extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
-int RunMixedFontDialog(wxFontDialog* dialog)
+int RunMixedFontDialog(wxFontDialog* WXUNUSED(dialog))
{
int retval = wxID_CANCEL ;
- bool cocoaLoaded = NSApplicationLoad();
- wxASSERT_MSG(cocoaLoaded,wxT("Couldn't load Cocoa in Carbon Environment")) ;
+ if ( !NSApplicationLoad() )
+ {
+ wxFAIL_MSG("Couldn't load Cocoa in Carbon Environment");
+ }
wxAutoNSAutoreleasePool pool;