Update of /cvsroot/mahogany/M/include/wx
In directory sc8-pr-cvs1:/tmp/cvs-serv26839/include/wx
Modified Files:
persctrl.h
Log Message:
pers msg boxes UI enhancements: don't predisable manually reenabled msg boxes; have
all options in one dialog, not two (bug 775)
Index: persctrl.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/wx/persctrl.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -b -u -2 -r1.37 -r1.38
--- persctrl.h 18 Sep 2003 16:30:45 -0000 1.37
+++ persctrl.h 28 Sep 2003 15:11:19 -0000 1.38
@@ -764,17 +764,22 @@
// ----------------------------------------------------------------------------
-// some additional style bits for the persistent message boxes
-//
-// they shouldn't conflict with the usual wxMessageDialog styles
-enum
+// parameters specifying how this message may be disabled
+struct WXDLLMAYEXP wxPMessageBoxParams
{
- // initially check the "don't remind me again" checkbox
- wxPMSGBOX_DISABLE = 0x2000,
-
- // don't allow disabling the message box on "No" value
- wxPMSGBOX_NOT_ON_NO = 0x4000
+ wxPMessageBoxParams()
+ : disableMsg(_("Don't show this message again "))
+ {
+ indexDisable = -1;
+ dontDisableOnNo = false;
+ }
+
+ wxString disableMsg;
+ wxArrayString disableOptions;
+ int indexDisable;
+ bool dontDisableOnNo;
};
-extern WXDLLMAYEXP int wxPMessageBox(const wxString& configPath,
+extern WXDLLMAYEXP int
+wxPMessageBox(const wxString& configPath,
const wxString& message,
const wxString& caption,
@@ -782,5 +787,5 @@
wxWindow *parent = NULL,
wxConfigBase *config = NULL,
- bool *wontShowAgain = NULL);
+ wxPMessageBoxParams *params = NULL);
// Return a non null value if the message box was previously disabled.
@@ -803,2 +808,3 @@
#endif // _WX_PWINDOW_H_
+
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
