Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed non appearance implementations

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

86
src/mac/carbon/msgdlg.cpp
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,85 +91,7 @@ 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 ) ;
if (m_dialogStyle & wxICON_EXCLAMATION)
result = Alert( resourceID , NULL ) ;
else if (m_dialogStyle & wxICON_HAND)
result = StopAlert( resourceID , NULL ) ;
else if (m_dialogStyle & wxICON_INFORMATION)
result = NoteAlert( resourceID , NULL ) ;
else if (m_dialogStyle & wxICON_QUESTION)
result = CautionAlert( resourceID , NULL ) ;
else
result = Alert( resourceID , NULL ) ;
resultbutton = result ;
if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_NO ;
break ;
case 3 :
resultbutton = wxID_CANCEL ;
break ;
}
}
else
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_NO ;
break ;
case 3 :
break ;
}
}
}
}
else
{
AlertStdAlertParamRec param; AlertStdAlertParamRec param;
param.movable = true; param.movable = true;
@@ -304,7 +220,7 @@ int wxMessageDialog::ShowModal()
} }
} }
} }
}
return resultbutton ; return resultbutton ;
} }

86
src/mac/msgdlg.cpp
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,85 +91,7 @@ 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 ) ;
if (m_dialogStyle & wxICON_EXCLAMATION)
result = Alert( resourceID , NULL ) ;
else if (m_dialogStyle & wxICON_HAND)
result = StopAlert( resourceID , NULL ) ;
else if (m_dialogStyle & wxICON_INFORMATION)
result = NoteAlert( resourceID , NULL ) ;
else if (m_dialogStyle & wxICON_QUESTION)
result = CautionAlert( resourceID , NULL ) ;
else
result = Alert( resourceID , NULL ) ;
resultbutton = result ;
if (m_dialogStyle & wxYES_NO)
{
if (m_dialogStyle & wxCANCEL)
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_NO ;
break ;
case 3 :
resultbutton = wxID_CANCEL ;
break ;
}
}
else
{
switch( result )
{
case 1 :
resultbutton = wxID_YES ;
break ;
case 2 :
resultbutton = wxID_NO ;
break ;
case 3 :
break ;
}
}
}
}
else
{
AlertStdAlertParamRec param; AlertStdAlertParamRec param;
param.movable = true; param.movable = true;
@@ -304,7 +220,7 @@ int wxMessageDialog::ShowModal()
} }
} }
} }
}
return resultbutton ; return resultbutton ;
} }