X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97ff49b3834325cfe53813aeb53d326d7661f184..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/richtext/richtextstylepage.h diff --git a/include/wx/richtext/richtextstylepage.h b/include/wx/richtext/richtextstylepage.h index 76db0aa241..0d6457a8db 100644 --- a/include/wx/richtext/richtextstylepage.h +++ b/include/wx/richtext/richtextstylepage.h @@ -1,30 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: richtextstylepage.h -// Purpose: +// Name: wx/richtext/richtextstylepage.h +// Purpose: // Author: Julian Smart -// Modified by: +// Modified by: // Created: 10/5/2006 11:34:55 AM -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _RICHTEXTSTYLEPAGE_H_ #define _RICHTEXTSTYLEPAGE_H_ -/*! - * Includes - */ - -////@begin includes -////@end includes - -/*! - * Forward declarations - */ - -////@begin forward declarations -////@end forward declarations +#include "wx/richtext/richtextdialogpage.h" /*! * Control identifiers @@ -32,37 +20,30 @@ ////@begin control identifiers #define SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL -#define SYMBOL_WXRICHTEXTSTYLEPAGE_TITLE _("wxRichTextStylePage") +#define SYMBOL_WXRICHTEXTSTYLEPAGE_TITLE wxEmptyString #define SYMBOL_WXRICHTEXTSTYLEPAGE_IDNAME ID_RICHTEXTSTYLEPAGE #define SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE wxSize(400, 300) #define SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION wxDefaultPosition ////@end control identifiers -/*! - * Compatibility - */ - -#ifndef wxCLOSE_BOX -#define wxCLOSE_BOX 0x1000 -#endif - /*! * wxRichTextStylePage class declaration */ -class wxRichTextStylePage: public wxPanel -{ +class WXDLLIMPEXP_RICHTEXT wxRichTextStylePage: public wxRichTextDialogPage +{ DECLARE_DYNAMIC_CLASS( wxRichTextStylePage ) DECLARE_EVENT_TABLE() + DECLARE_HELP_PROVISION() public: /// Constructors wxRichTextStylePage( ); - wxRichTextStylePage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSTYLEPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE ); + wxRichTextStylePage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE ); /// Creation - bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSTYLEPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE ); - + bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE ); + /// Initialise members void Init(); @@ -74,7 +55,7 @@ public: virtual bool TransferDataToWindow(); /// Gets the attributes associated with the main formatting dialog - wxTextAttrEx* GetAttributes(); + wxRichTextAttr* GetAttributes(); ////@begin wxRichTextStylePage event handler declarations