wxMessageBox off the main thread lost result code.

[wxWidgets.git] / interface / wx / richtext / richtextstyledlg.h

diff --git a/interface/wx/richtext/richtextstyledlg.h b/interface/wx/richtext/richtextstyledlg.h
index fac7c75dbde558b4c231e54c9143cc873f7ba62b..bcf1604500440783cd72fbfe8781270ebd31fa6d 100644 (file)
--- a/interface/wx/richtext/richtextstyledlg.h
+++ b/interface/wx/richtext/richtextstyledlg.h
@@ -2,10 +2,35 @@
 // Name:        richtext/richtextstyledlg.h
 // Purpose:     interface of wxRichTextStyleOrganiserDialog
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+
+/*!
+ * Flags for specifying permitted operations
+ */
+
+#define wxRICHTEXT_ORGANISER_DELETE_STYLES  0x0001
+#define wxRICHTEXT_ORGANISER_CREATE_STYLES  0x0002
+#define wxRICHTEXT_ORGANISER_APPLY_STYLES   0x0004
+#define wxRICHTEXT_ORGANISER_EDIT_STYLES    0x0008
+#define wxRICHTEXT_ORGANISER_RENAME_STYLES  0x0010
+#define wxRICHTEXT_ORGANISER_OK_CANCEL      0x0020
+#define wxRICHTEXT_ORGANISER_RENUMBER       0x0040
+
+// The permitted style types to show
+#define wxRICHTEXT_ORGANISER_SHOW_CHARACTER 0x0100
+#define wxRICHTEXT_ORGANISER_SHOW_PARAGRAPH 0x0200
+#define wxRICHTEXT_ORGANISER_SHOW_LIST      0x0400
+#define wxRICHTEXT_ORGANISER_SHOW_BOX       0x0800
+#define wxRICHTEXT_ORGANISER_SHOW_ALL       0x1000
+
+// Common combinations
+#define wxRICHTEXT_ORGANISER_ORGANISE (wxRICHTEXT_ORGANISER_SHOW_ALL|wxRICHTEXT_ORGANISER_DELETE_STYLES|wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_APPLY_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES|wxRICHTEXT_ORGANISER_RENAME_STYLES)
+#define wxRICHTEXT_ORGANISER_BROWSE (wxRICHTEXT_ORGANISER_SHOW_ALL|wxRICHTEXT_ORGANISER_OK_CANCEL)
+#define wxRICHTEXT_ORGANISER_BROWSE_NUMBERING (wxRICHTEXT_ORGANISER_SHOW_LIST|wxRICHTEXT_ORGANISER_OK_CANCEL|wxRICHTEXT_ORGANISER_RENUMBER)
+
+
 /**
     @class wxRichTextStyleOrganiserDialog
 
@@ -83,15 +108,9 @@ public:
     /**
         Creates the dialog. See the ctor.
     */
-    bool Create(int flags,
-                wxRichTextStyleSheet* sheet,
-                wxRichTextCtrl* ctrl,
-                wxWindow* parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& caption = _("Style Organiser"),
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX);
+    bool Create(int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl,
+                wxWindow* parent, wxWindowID id = wxID_ANY,
+                const wxString& caption = wxGetTranslation("Style Organiser"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400, 300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX);
 
     /**
         Returns @true if the user has opted to restart numbering.