check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h
index fa9ac649a73c1f42f64679db7ed0b31a6e72bf63..3e2a6c774a46c18a1ae3adfffb596e4266f4b0a2 100644 (file)
--- a/include/wx/richtext/richtextstyledlg.h
+++ b/include/wx/richtext/richtextstyledlg.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        richtextstyledlg.h
-// Purpose:     
+// Name:        wx/richtext/richtextstyledlg.h
+// Purpose:

 // Author:      Julian Smart
 // Author:      Julian Smart

-// Modified by: 
+// Modified by:

 // Created:     10/5/2006 12:05:31 PM
 // Created:     10/5/2006 12:05:31 PM

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Copyright:   (c) Julian Smart

-// Licence:     
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTSTYLEDLG_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _RICHTEXTSTYLEDLG_H_


@@ -48,7 +48,7 @@ class wxRichTextCtrl;
 /*!
  * Flags for specifying permitted operations
  */
 /*!
  * 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_DELETE_STYLES  0x0001
 #define wxRICHTEXT_ORGANISER_CREATE_STYLES  0x0002
 #define wxRICHTEXT_ORGANISER_APPLY_STYLES   0x0004


@@ -72,33 +72,33 @@ class wxRichTextCtrl;
  * wxRichTextStyleOrganiserDialog class declaration
  */
 
  * wxRichTextStyleOrganiserDialog class declaration
  */
 

-class wxRichTextStyleOrganiserDialog: public wxDialog
-{    
+class WXDLLIMPEXP_RICHTEXT wxRichTextStyleOrganiserDialog: public wxDialog
+{

     DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
     DECLARE_EVENT_TABLE()
 
 public:
     /// Constructors
     wxRichTextStyleOrganiserDialog( );
     DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
     DECLARE_EVENT_TABLE()
 
 public:
     /// Constructors
     wxRichTextStyleOrganiserDialog( );

-    wxRichTextStyleOrganiserDialog( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
+    wxRichTextStyleOrganiserDialog( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );

 
     /// Creation
 
     /// Creation

-    bool Create( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
+    bool Create( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );

 
     /// Creates the controls and sizers
     void CreateControls();
 
     /// Creates the controls and sizers
     void CreateControls();

-    
+

     /// Initialise member variables
     void Init();
 
     /// Transfer data from/to window
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
     /// Initialise member variables
     void Init();
 
     /// Transfer data from/to window
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();

-    
+

     /// Set/get style sheet
     void SetStyleSheet(wxRichTextStyleSheet* sheet) { m_richTextStyleSheet = sheet; }
     wxRichTextStyleSheet* GetStyleSheet() const { return m_richTextStyleSheet; }
     /// Set/get style sheet
     void SetStyleSheet(wxRichTextStyleSheet* sheet) { m_richTextStyleSheet = sheet; }
     wxRichTextStyleSheet* GetStyleSheet() const { return m_richTextStyleSheet; }

-    
+

     /// Set/get control
     void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_richTextCtrl = ctrl; }
     wxRichTextCtrl* GetRichTextCtrl() const { return m_richTextCtrl; }
     /// Set/get control
     void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_richTextCtrl = ctrl; }
     wxRichTextCtrl* GetRichTextCtrl() const { return m_richTextCtrl; }


@@ -106,30 +106,30 @@ public:
     /// Set/get flags
     void SetFlags(int flags) { m_flags = flags; }
     int GetFlags() const { return m_flags; }
     /// Set/get flags
     void SetFlags(int flags) { m_flags = flags; }
     int GetFlags() const { return m_flags; }

-    
+

     /// Show preview for given or selected preview
     void ShowPreview(int sel = -1);
     /// Show preview for given or selected preview
     void ShowPreview(int sel = -1);

-    
+

     /// Clears the preview
     void ClearPreview();
     /// Clears the preview
     void ClearPreview();

-    
+

     /// List selection
     void OnListSelection(wxCommandEvent& event);
     /// List selection
     void OnListSelection(wxCommandEvent& event);

-    
+

     /// Get/set restart numbering boolean
     bool GetRestartNumbering() const { return m_restartNumbering; }
     void SetRestartNumbering(bool restartNumbering) { m_restartNumbering = restartNumbering; }
     /// Get/set restart numbering boolean
     bool GetRestartNumbering() const { return m_restartNumbering; }
     void SetRestartNumbering(bool restartNumbering) { m_restartNumbering = restartNumbering; }

-    
+

     /// Get selected style name or definition
     wxString GetSelectedStyle() const;
     wxRichTextStyleDefinition* GetSelectedStyleDefinition() const;
     /// Get selected style name or definition
     wxString GetSelectedStyle() const;
     wxRichTextStyleDefinition* GetSelectedStyleDefinition() const;

-    
+

     /// Apply the style
     bool ApplyStyle(wxRichTextCtrl* ctrl = NULL);
 
     /// Should we show tooltips?
     static bool ShowToolTips() { return sm_showToolTips; }
     /// Apply the style
     bool ApplyStyle(wxRichTextCtrl* ctrl = NULL);
 
     /// Should we show tooltips?
     static bool ShowToolTips() { return sm_showToolTips; }

-    
+

     /// Determines whether tooltips will be shown
     static void SetShowToolTips(bool show) { sm_showToolTips = show; }
 
     /// Determines whether tooltips will be shown
     static void SetShowToolTips(bool show) { sm_showToolTips = show; }
 


@@ -210,6 +210,7 @@ public:
     enum {
         ID_RICHTEXTSTYLEORGANISERDIALOG = 10500,
         ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES = 10501,
     enum {
         ID_RICHTEXTSTYLEORGANISERDIALOG = 10500,
         ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES = 10501,

+        ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE = 10510,

         ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW = 10509,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR = 10504,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA = 10505,
         ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW = 10509,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR = 10504,
         ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA = 10505,


@@ -226,7 +227,7 @@ private:
 
     wxRichTextCtrl*         m_richTextCtrl;
     wxRichTextStyleSheet*   m_richTextStyleSheet;
 
     wxRichTextCtrl*         m_richTextCtrl;
     wxRichTextStyleSheet*   m_richTextStyleSheet;

-    
+

     bool                    m_dontUpdate;
     int                     m_flags;
     static bool             sm_showToolTips;
     bool                    m_dontUpdate;
     int                     m_flags;
     static bool             sm_showToolTips;