Border corrections, and more compact dialog sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,10 +34,10 @@ class wxRichTextFontPreviewCtrl;
|
||||
*/
|
||||
|
||||
////@begin control identifiers
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_STYLE wxTAB_TRAVERSAL
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_TITLE _("wxRichTextFontPage")
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_IDNAME ID_RICHTEXTFONTPAGE
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_SIZE wxSize(400, 300)
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_SIZE wxSize(200, 100)
|
||||
#define SYMBOL_WXRICHTEXTFONTPAGE_POSITION wxDefaultPosition
|
||||
////@end control identifiers
|
||||
|
||||
|
@@ -218,12 +218,7 @@ DECLARE_EVENT_TABLE()
|
||||
class WXDLLIMPEXP_RICHTEXT wxRichTextFontPreviewCtrl : public wxWindow
|
||||
{
|
||||
public:
|
||||
wxRichTextFontPreviewCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = 0) :
|
||||
wxWindow(parent, id, pos, sz, style)
|
||||
{
|
||||
SetBackgroundColour(*wxWHITE);
|
||||
m_textEffects = 0;
|
||||
}
|
||||
wxRichTextFontPreviewCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = 0);
|
||||
|
||||
void SetTextEffects(int effects) { m_textEffects = effects; }
|
||||
int GetTextEffects() const { return m_textEffects; }
|
||||
|
@@ -27,9 +27,6 @@
|
||||
|
||||
////@begin forward declarations
|
||||
class wxSymbolListCtrl;
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
|
||||
|
||||
////@end forward declarations
|
||||
|
||||
// __UNICODE__ is a symbol used by DialogBlocks-generated code.
|
||||
@@ -119,10 +116,16 @@ public:
|
||||
void OnFromUnicodeSelected( wxCommandEvent& event );
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOS2__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
|
||||
/// wxEVT_UPDATE_UI event handler for wxID_OK
|
||||
void OnOkUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
#endif
|
||||
#if defined(__WXMAC__)
|
||||
/// wxEVT_UPDATE_UI event handler for wxID_OK
|
||||
void OnOkUpdate( wxUpdateUIEvent& event );
|
||||
|
||||
#endif
|
||||
////@end wxSymbolPickerDialog event handler declarations
|
||||
|
||||
////@begin wxSymbolPickerDialog member function declarations
|
||||
|
Reference in New Issue
Block a user