root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 500

Browse Source 
Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :
Ripristinato comportamento error_box


git-svn-id: svn://10.65.10.50/trunk@19573 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-11-04 14:48:58 +00:00
parent f659503802
commit 0bbbc30ede
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xvaga/xvtdm.cpp
View File

@ -134,7 +134,6 @@ TMessageBox::TMessageBox(wxWindow* pParent, const wxString& msg, int nStyle, int
SetSizerAndFit(sizer); SetSizerAndFit(sizer);
if (nStyle & wxCENTRE)
Centre(); Centre();
if (nTimeout > 0) if (nTimeout > 0)
@ -278,7 +277,7 @@ static void _PopUpBox(const wxString& msg, int nStyle, int nTimeout = 4)
dlg.ShowModal(); dlg.ShowModal();
} }
else else
_MessageBox(msg, nStyle|wxOK|wxCENTRE, nTimeout); _MessageBox(msg, nStyle|wxOK, nTimeout);
} }
WX_DECLARE_STRING_HASH_MAP(int, TMessagesMap); WX_DECLARE_STRING_HASH_MAP(int, TMessagesMap);
@ -499,7 +498,7 @@ BOOLEAN xvt_dm_post_speech(const char* text, int priority, BOOLEAN async)
ASK_RESPONSE xvt_dm_post_ask(const char* Btn1, const char* Btn2, const char* Btn3, const char* fmt) ASK_RESPONSE xvt_dm_post_ask(const char* Btn1, const char* Btn2, const char* Btn3, const char* fmt)
{ {
int nFlags = wxCENTRE | wxICON_QUESTION | wxYES_NO; int nFlags = wxICON_QUESTION | wxYES_NO;
if (Btn3 == NULL) if (Btn3 == NULL)
{ {
if (wxStricmp(Btn1, "no") == 0) if (wxStricmp(Btn1, "no") == 0)
@ -514,8 +513,7 @@ ASK_RESPONSE xvt_dm_post_ask(const char* Btn1, const char* Btn2, const char* Btn
void xvt_dm_post_error(const char *fmt) void xvt_dm_post_error(const char *fmt)
{ {
//_MessageBox(fmt, wxOK | wxCENTRE | wxICON_HAND); _MessageBox(fmt, wxOK | wxICON_HAND);
_PopUpBox(fmt, wxICON_HAND, 0);
} }
void xvt_dm_post_fatal_exit(const char *fmt) void xvt_dm_post_fatal_exit(const char *fmt)
@ -609,13 +607,13 @@ BOOLEAN xvt_dm_post_font_sel(WINDOW win, XVT_FNTID font_id, PRINT_RCD* WXUNUSED(
void xvt_dm_post_message(const char *fmt) void xvt_dm_post_message(const char *fmt)
{ {
//_MessageBox(fmt, wxOK | wxCENTRE | wxICON_INFORMATION); //_MessageBox(fmt, wxOK | wxICON_INFORMATION);
_PopUpBox(fmt, wxICON_INFORMATION, 0); _PopUpBox(fmt, wxICON_INFORMATION, 0);
} }
void xvt_dm_post_note(const char *fmt) void xvt_dm_post_note(const char *fmt)
{ {
// _MessageBox(fmt, wxOK | wxCENTRE | wxICON_EXCLAMATION); // _MessageBox(fmt, wxOK | wxICON_EXCLAMATION);
_PopUpBox(fmt, wxICON_EXCLAMATION, 0); _PopUpBox(fmt, wxICON_EXCLAMATION, 0);
} }
@ -637,8 +635,7 @@ char* xvt_dm_post_string_prompt(const char* message, char* response, int respons
void xvt_dm_post_warning(const char *fmt) void xvt_dm_post_warning(const char *fmt)
{ {
// _MessageBox(fmt, wxOK | wxCENTRE | wxICON_EXCLAMATION); _MessageBox(fmt, wxOK|wxICON_EXCLAMATION);
_PopUpBox(fmt, wxICON_EXCLAMATION, 0);
} }
void xvt_dm_popup_error(const char *fmt) void xvt_dm_popup_error(const char *fmt)