Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15929/include/gui
Modified Files:
wxMDialogs.h
Log Message:
changed MProgressDialog to take flags, as wxProgressDialog does, not bool parameters
Index: wxMDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMDialogs.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -b -u -2 -r1.115 -r1.116
--- wxMDialogs.h 23 Apr 2004 10:00:41 -0000 1.115
+++ wxMDialogs.h 13 Jul 2004 23:28:55 -0000 1.116
@@ -73,23 +73,21 @@
@param maximum maximum value for status bar, if <= 0, no bar is shown
@param parent window or NULL
- @param disableParentOnly if true, only disable parent window's
- event handling
- @param abortButton if true, dialog will show an abort button
+ @param flags combination of wxPD_XXX (default ones are always used)
*/
MProgressDialog(wxString const &title, wxString const &message,
int maximum = 100,
wxWindow *parent = NULL,
- bool disableParentOnly = false,
- bool abortButton = false)
- : wxProgressDialog(wxString(_T("Mahogany : ")) + title, message,
- maximum, parent,
- (disableParentOnly ? 0 : wxPD_APP_MODAL) |
- (abortButton ? wxPD_CAN_ABORT : 0) |
- wxPD_AUTO_HIDE
-#ifdef wxPD_ESTIMATED_TIME
- |wxPD_ESTIMATED_TIME
- |wxPD_ELAPSED_TIME
- |wxPD_REMAINING_TIME
-#endif
+ int flags = wxPD_APP_MODAL | wxPD_CAN_ABORT)
+ : wxProgressDialog
+ (
+ wxString(_T("Mahogany : ")) + title,
+ message,
+ maximum,
+ parent,
+ flags |
+ wxPD_AUTO_HIDE |
+ wxPD_ESTIMATED_TIME |
+ wxPD_ELAPSED_TIME |
+ wxPD_REMAINING_TIME
)
{
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
