style
(Steve: sorry for poking around in code I can't test, but I'd like source consistency in platform-specific code, too. I'll commit in small pieces so it's clear what I'm up to, so it should be trivial to fix if I miss something.)
This commit is contained in:
@@ -21,17 +21,17 @@ static SInt16 ShowAlert( int type, CFStringRef message, CFStringRef OK, CFString
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogDriver_Cocoa::OK( CString sMessage, CString ID )
|
void DialogDriver_Cocoa::OK( CString sMessage, CString sID )
|
||||||
{
|
{
|
||||||
CFStringRef message = CFStringCreateWithCString(NULL, sMessage, kCFStringEncodingASCII);
|
CFStringRef message = CFStringCreateWithCString(NULL, sMessage, kCFStringEncodingASCII);
|
||||||
SInt16 result = ShowAlert(kAlertNoteAlert, message, CFSTR("OK"), CFSTR("Don't show again"));
|
SInt16 result = ShowAlert(kAlertNoteAlert, message, CFSTR("OK"), CFSTR("Don't show again"));
|
||||||
|
|
||||||
CFRelease(message);
|
CFRelease(message);
|
||||||
if( result == kAlertStdAlertCancelButton )
|
if( result == kAlertStdAlertCancelButton )
|
||||||
Dialog::IgnoreMessage( ID );
|
Dialog::IgnoreMessage( sID );
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogDriver_Cocoa::Error( CString sError, CString ID )
|
void DialogDriver_Cocoa::Error( CString sError, CString sID )
|
||||||
{
|
{
|
||||||
CFStringRef error = CFStringCreateWithCString( NULL, sError, kCFStringEncodingASCII );
|
CFStringRef error = CFStringCreateWithCString( NULL, sError, kCFStringEncodingASCII );
|
||||||
ShowAlert(kAlertStopAlert, error, CFSTR("OK"));
|
ShowAlert(kAlertStopAlert, error, CFSTR("OK"));
|
||||||
@@ -40,7 +40,7 @@ void DialogDriver_Cocoa::Error( CString sError, CString ID )
|
|||||||
}
|
}
|
||||||
|
|
||||||
// XXX: should show three options, not two
|
// XXX: should show three options, not two
|
||||||
Dialog::Result DialogDriver_Cocoa::AbortRetryIgnore( CString sMessage, CString ID )
|
Dialog::Result DialogDriver_Cocoa::AbortRetryIgnore( CString sMessage, CString sID )
|
||||||
{
|
{
|
||||||
CFStringRef error = CFStringCreateWithCString( NULL, sMessage, kCFStringEncodingASCII );
|
CFStringRef error = CFStringCreateWithCString( NULL, sMessage, kCFStringEncodingASCII );
|
||||||
SInt16 result = ShowAlert( kAlertNoteAlert, error, CFSTR("Retry"), CFSTR("Ignore") );
|
SInt16 result = ShowAlert( kAlertNoteAlert, error, CFSTR("Retry"), CFSTR("Ignore") );
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
class DialogDriver_Cocoa: public DialogDriver
|
class DialogDriver_Cocoa: public DialogDriver
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void Error(CString sError, CString ID);
|
void Error( CString sError, CString sID );
|
||||||
void OK(CString sMessage, CString ID);
|
void OK( CString sMessage, CString sID );
|
||||||
Dialog::Result AbortRetryIgnore(CString sMessage, CString ID);
|
Dialog::Result AbortRetryIgnore( CString sMessage, CString sID );
|
||||||
};
|
};
|
||||||
#define USE_DIALOG_DRIVER_COCOA
|
#define USE_DIALOG_DRIVER_COCOA
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user