removed non appearance implementations

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-01-20 16:32:42 +00:00
parent d9e054bc61
commit d09487dd4e
2 changed files with 238 additions and 406 deletions

View File

@@ -22,12 +22,6 @@
IMPLEMENT_CLASS(wxMessageDialog, wxDialog) IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
#endif #endif
#define kMacOKAlertResourceID 128
#define kMacYesNoAlertResourceID 129
#define kMacYesNoCancelAlertResourceID 130
#define kMacNoYesAlertResourceID 131
#define kMacNoYesCancelAlertResourceID 132
short language = 0 ; short language = 0 ;
void wxMacConvertNewlines( const char *source , char * destination ) ; void wxMacConvertNewlines( const char *source , char * destination ) ;
@@ -97,214 +91,136 @@ int wxMessageDialog::ShowModal()
wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ; wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
if ( !UMAHasAppearance() )
{
int resourceID ;
if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
resourceID = kMacYesNoCancelAlertResourceID;
else
resourceID = kMacYesNoAlertResourceID + language * 10 ;
}
else if (m_dialogStyle & wxOK)
{
if (m_dialogStyle & wxCANCEL)
resourceID = kMacOKAlertResourceID; // wrong
else
resourceID = kMacOKAlertResourceID;
}
else
{
return resultbutton ;
}
/*
if (hWnd)
msStyle |= MB_APPLMODAL;
else
msStyle |= MB_TASKMODAL;
*/
ParamText( pascalTitle , pascalText , NULL , NULL ) ; AlertStdAlertParamRec param;
if (m_dialogStyle & wxICON_EXCLAMATION) param.movable = true;
result = Alert( resourceID , NULL ) ; param.filterProc = NULL ;
else if (m_dialogStyle & wxICON_HAND)
result = StopAlert( resourceID , NULL ) ; if (m_dialogStyle & wxYES_NO)
else if (m_dialogStyle & wxICON_INFORMATION) {
result = NoteAlert( resourceID , NULL ) ; if (m_dialogStyle & wxCANCEL)
else if (m_dialogStyle & wxICON_QUESTION) {
result = CautionAlert( resourceID , NULL ) ; param.defaultText = yesPString ;
else param.cancelText = (StringPtr) kAlertDefaultCancelText;
result = Alert( resourceID , NULL ) ; param.otherText = noPString ;
param.helpButton = false ;
resultbutton = result ; param.defaultButton = kAlertStdAlertOKButton;
param.cancelButton = kAlertStdAlertCancelButton;
if (m_dialogStyle & wxYES_NO) }
{ else
if (m_dialogStyle & wxCANCEL) {
{ param.defaultText = yesPString ;
switch( result ) param.cancelText = NULL;
{ param.otherText = noPString ;
case 1 : param.helpButton = false ;
resultbutton = wxID_YES ; param.defaultButton = kAlertStdAlertOKButton;
break ; param.cancelButton = 0;
case 2 : }
resultbutton = wxID_NO ; }
break ; else if (m_dialogStyle & wxOK)
case 3 : {
resultbutton = wxID_CANCEL ; if (m_dialogStyle & wxCANCEL)
break ; {
} // thats a cancel missing
} param.defaultText = (StringPtr) kAlertDefaultOKText ;
else param.cancelText = NULL;
{ param.otherText = NULL;
switch( result ) param.helpButton = false ;
{ param.defaultButton = kAlertStdAlertOKButton;
case 1 : param.cancelButton = 0;
resultbutton = wxID_YES ; }
break ; else
case 2 : {
resultbutton = wxID_NO ; param.defaultText = (StringPtr) kAlertDefaultOKText ;
break ; param.cancelText = NULL;
case 3 : param.otherText = NULL;
break ; param.helpButton = false ;
} param.defaultButton = kAlertStdAlertOKButton;
} param.cancelButton = 0;
} }
} }
else else
{ {
AlertStdAlertParamRec param; return resultbutton ;
}
param.movable = true; param.position = 0;
param.filterProc = NULL ;
if (m_dialogStyle & wxICON_EXCLAMATION)
if (m_dialogStyle & wxYES_NO) StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
{ else if (m_dialogStyle & wxICON_HAND)
if (m_dialogStyle & wxCANCEL) StandardAlert( kAlertStopAlert, pascalTitle, pascalText, &param, &result );
{ else if (m_dialogStyle & wxICON_INFORMATION)
param.defaultText = yesPString ; StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
param.cancelText = (StringPtr) kAlertDefaultCancelText; else if (m_dialogStyle & wxICON_QUESTION)
param.otherText = noPString ; StandardAlert( kAlertCautionAlert, pascalTitle, pascalText, &param, &result );
param.helpButton = false ; else
param.defaultButton = kAlertStdAlertOKButton; StandardAlert( kAlertPlainAlert, pascalTitle, pascalText, &param, &result );
param.cancelButton = kAlertStdAlertCancelButton;
} if (m_dialogStyle & wxOK)
else {
{ if (m_dialogStyle & wxCANCEL)
param.defaultText = yesPString ; {
param.cancelText = NULL; //TODO add Cancelbutton
param.otherText = noPString ; switch( result )
param.helpButton = false ; {
param.defaultButton = kAlertStdAlertOKButton; case 1 :
param.cancelButton = 0; resultbutton = wxID_OK ;
} break ;
} case 2 :
else if (m_dialogStyle & wxOK) break ;
{ case 3 :
if (m_dialogStyle & wxCANCEL) break ;
{ }
// thats a cancel missing }
param.defaultText = (StringPtr) kAlertDefaultOKText ;
param.cancelText = NULL;
param.otherText = NULL;
param.helpButton = false ;
param.defaultButton = kAlertStdAlertOKButton;
param.cancelButton = 0;
}
else
{
param.defaultText = (StringPtr) kAlertDefaultOKText ;
param.cancelText = NULL;
param.otherText = NULL;
param.helpButton = false ;
param.defaultButton = kAlertStdAlertOKButton;
param.cancelButton = 0;
}
}
else else
{ {
return resultbutton ; switch( result )
}
param.position = 0;
if (m_dialogStyle & wxICON_EXCLAMATION)
StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
else if (m_dialogStyle & wxICON_HAND)
StandardAlert( kAlertStopAlert, pascalTitle, pascalText, &param, &result );
else if (m_dialogStyle & wxICON_INFORMATION)
StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
else if (m_dialogStyle & wxICON_QUESTION)
StandardAlert( kAlertCautionAlert, pascalTitle, pascalText, &param, &result );
else
StandardAlert( kAlertPlainAlert, pascalTitle, pascalText, &param, &result );
if (m_dialogStyle & wxOK)
{
if (m_dialogStyle & wxCANCEL)
{
//TODO add Cancelbutton
switch( result )
{
case 1 :
resultbutton = wxID_OK ;
break ;
case 2 :
break ;
case 3 :
break ;
}
}
else
{ {
switch( result ) case 1 :
{ resultbutton = wxID_OK ;
case 1 : break ;
resultbutton = wxID_OK ; case 2 :
break ; break ;
case 2 : case 3 :
break ; break ;
case 3 :
break ;
}
} }
} }
else if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_CANCEL ;
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
else
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
}
} }
else if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_CANCEL ;
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
else
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
}
return resultbutton ; return resultbutton ;
} }

View File

@@ -22,12 +22,6 @@
IMPLEMENT_CLASS(wxMessageDialog, wxDialog) IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
#endif #endif
#define kMacOKAlertResourceID 128
#define kMacYesNoAlertResourceID 129
#define kMacYesNoCancelAlertResourceID 130
#define kMacNoYesAlertResourceID 131
#define kMacNoYesCancelAlertResourceID 132
short language = 0 ; short language = 0 ;
void wxMacConvertNewlines( const char *source , char * destination ) ; void wxMacConvertNewlines( const char *source , char * destination ) ;
@@ -97,214 +91,136 @@ int wxMessageDialog::ShowModal()
wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ; wxASSERT_MSG( ( m_dialogStyle & 0x3F ) != wxYES , "this style is not supported on mac" ) ;
if ( !UMAHasAppearance() )
{
int resourceID ;
if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
resourceID = kMacYesNoCancelAlertResourceID;
else
resourceID = kMacYesNoAlertResourceID + language * 10 ;
}
else if (m_dialogStyle & wxOK)
{
if (m_dialogStyle & wxCANCEL)
resourceID = kMacOKAlertResourceID; // wrong
else
resourceID = kMacOKAlertResourceID;
}
else
{
return resultbutton ;
}
/*
if (hWnd)
msStyle |= MB_APPLMODAL;
else
msStyle |= MB_TASKMODAL;
*/
ParamText( pascalTitle , pascalText , NULL , NULL ) ; AlertStdAlertParamRec param;
if (m_dialogStyle & wxICON_EXCLAMATION) param.movable = true;
result = Alert( resourceID , NULL ) ; param.filterProc = NULL ;
else if (m_dialogStyle & wxICON_HAND)
result = StopAlert( resourceID , NULL ) ; if (m_dialogStyle & wxYES_NO)
else if (m_dialogStyle & wxICON_INFORMATION) {
result = NoteAlert( resourceID , NULL ) ; if (m_dialogStyle & wxCANCEL)
else if (m_dialogStyle & wxICON_QUESTION) {
result = CautionAlert( resourceID , NULL ) ; param.defaultText = yesPString ;
else param.cancelText = (StringPtr) kAlertDefaultCancelText;
result = Alert( resourceID , NULL ) ; param.otherText = noPString ;
param.helpButton = false ;
resultbutton = result ; param.defaultButton = kAlertStdAlertOKButton;
param.cancelButton = kAlertStdAlertCancelButton;
if (m_dialogStyle & wxYES_NO) }
{ else
if (m_dialogStyle & wxCANCEL) {
{ param.defaultText = yesPString ;
switch( result ) param.cancelText = NULL;
{ param.otherText = noPString ;
case 1 : param.helpButton = false ;
resultbutton = wxID_YES ; param.defaultButton = kAlertStdAlertOKButton;
break ; param.cancelButton = 0;
case 2 : }
resultbutton = wxID_NO ; }
break ; else if (m_dialogStyle & wxOK)
case 3 : {
resultbutton = wxID_CANCEL ; if (m_dialogStyle & wxCANCEL)
break ; {
} // thats a cancel missing
} param.defaultText = (StringPtr) kAlertDefaultOKText ;
else param.cancelText = NULL;
{ param.otherText = NULL;
switch( result ) param.helpButton = false ;
{ param.defaultButton = kAlertStdAlertOKButton;
case 1 : param.cancelButton = 0;
resultbutton = wxID_YES ; }
break ; else
case 2 : {
resultbutton = wxID_NO ; param.defaultText = (StringPtr) kAlertDefaultOKText ;
break ; param.cancelText = NULL;
case 3 : param.otherText = NULL;
break ; param.helpButton = false ;
} param.defaultButton = kAlertStdAlertOKButton;
} param.cancelButton = 0;
} }
} }
else else
{ {
AlertStdAlertParamRec param; return resultbutton ;
}
param.movable = true; param.position = 0;
param.filterProc = NULL ;
if (m_dialogStyle & wxICON_EXCLAMATION)
if (m_dialogStyle & wxYES_NO) StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
{ else if (m_dialogStyle & wxICON_HAND)
if (m_dialogStyle & wxCANCEL) StandardAlert( kAlertStopAlert, pascalTitle, pascalText, &param, &result );
{ else if (m_dialogStyle & wxICON_INFORMATION)
param.defaultText = yesPString ; StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
param.cancelText = (StringPtr) kAlertDefaultCancelText; else if (m_dialogStyle & wxICON_QUESTION)
param.otherText = noPString ; StandardAlert( kAlertCautionAlert, pascalTitle, pascalText, &param, &result );
param.helpButton = false ; else
param.defaultButton = kAlertStdAlertOKButton; StandardAlert( kAlertPlainAlert, pascalTitle, pascalText, &param, &result );
param.cancelButton = kAlertStdAlertCancelButton;
} if (m_dialogStyle & wxOK)
else {
{ if (m_dialogStyle & wxCANCEL)
param.defaultText = yesPString ; {
param.cancelText = NULL; //TODO add Cancelbutton
param.otherText = noPString ; switch( result )
param.helpButton = false ; {
param.defaultButton = kAlertStdAlertOKButton; case 1 :
param.cancelButton = 0; resultbutton = wxID_OK ;
} break ;
} case 2 :
else if (m_dialogStyle & wxOK) break ;
{ case 3 :
if (m_dialogStyle & wxCANCEL) break ;
{ }
// thats a cancel missing }
param.defaultText = (StringPtr) kAlertDefaultOKText ;
param.cancelText = NULL;
param.otherText = NULL;
param.helpButton = false ;
param.defaultButton = kAlertStdAlertOKButton;
param.cancelButton = 0;
}
else
{
param.defaultText = (StringPtr) kAlertDefaultOKText ;
param.cancelText = NULL;
param.otherText = NULL;
param.helpButton = false ;
param.defaultButton = kAlertStdAlertOKButton;
param.cancelButton = 0;
}
}
else else
{ {
return resultbutton ; switch( result )
}
param.position = 0;
if (m_dialogStyle & wxICON_EXCLAMATION)
StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
else if (m_dialogStyle & wxICON_HAND)
StandardAlert( kAlertStopAlert, pascalTitle, pascalText, &param, &result );
else if (m_dialogStyle & wxICON_INFORMATION)
StandardAlert( kAlertNoteAlert, pascalTitle, pascalText, &param, &result );
else if (m_dialogStyle & wxICON_QUESTION)
StandardAlert( kAlertCautionAlert, pascalTitle, pascalText, &param, &result );
else
StandardAlert( kAlertPlainAlert, pascalTitle, pascalText, &param, &result );
if (m_dialogStyle & wxOK)
{
if (m_dialogStyle & wxCANCEL)
{
//TODO add Cancelbutton
switch( result )
{
case 1 :
resultbutton = wxID_OK ;
break ;
case 2 :
break ;
case 3 :
break ;
}
}
else
{ {
switch( result ) case 1 :
{ resultbutton = wxID_OK ;
case 1 : break ;
resultbutton = wxID_OK ; case 2 :
break ; break ;
case 2 : case 3 :
break ; break ;
case 3 :
break ;
}
} }
} }
else if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_CANCEL ;
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
else
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
}
} }
else if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_CANCEL ;
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
else
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
break ;
case 3 :
resultbutton = wxID_NO ;
break ;
}
}
}
return resultbutton ; return resultbutton ;
} }