#ifndef WX_PRECOMP
#include <stdio.h>
+ #include "wx/crt.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/listbox.h"
#include "wx/checkbox.h"
#include "wx/intl.h"
#include "wx/settings.h"
+ #include "wx/sizer.h"
#endif
#include <string.h>
#include <stdlib.h>
-#include "wx/cmndata.h"
-#include "wx/sizer.h"
#include "wx/fontdlg.h"
#include "wx/generic/fontdlgg.h"
dc.SetBrush(*wxWHITE_BRUSH);
dc.DrawRectangle(0, 0, size.x, size.y);
- if ( font.Ok() )
+ if ( font.IsOk() )
{
dc.SetFont(font);
- // Calculate vertical centre
- long w = 0, h = 0;
- dc.GetTextExtent( wxT("X"), &w, &h);
dc.SetTextForeground(GetForegroundColour());
dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
dc.DrawText(_("ABCDEFGabcdefg12345"),
- 10, size.y/2 - h/2);
+ 10, (size.y - dc.GetTextExtent(wxT("X")).y)/2);
dc.DestroyClippingRegion();
}
}
+//-----------------------------------------------------------------------------
+// helper functions
+//-----------------------------------------------------------------------------
+
+static const wxChar *wxFontWeightIntToString(int weight)
+{
+ switch (weight)
+ {
+ case wxLIGHT:
+ return wxT("Light");
+ case wxBOLD:
+ return wxT("Bold");
+ case wxNORMAL:
+ default:
+ return wxT("Normal");
+ }
+}
+
+static const wxChar *wxFontStyleIntToString(int style)
+{
+ switch (style)
+ {
+ case wxITALIC:
+ return wxT("Italic");
+ case wxSLANT:
+ return wxT("Slant");
+ case wxNORMAL:
+ default:
+ return wxT("Normal");
+ }
+}
+
+static const wxChar *wxFontFamilyIntToString(int family)
+{
+ switch (family)
+ {
+ case wxROMAN:
+ return wxT("Roman");
+ case wxDECORATIVE:
+ return wxT("Decorative");
+ case wxMODERN:
+ return wxT("Modern");
+ case wxSCRIPT:
+ return wxT("Script");
+ case wxTELETYPE:
+ return wxT("Teletype");
+ case wxSWISS:
+ default:
+ return wxT("Swiss");
+ }
+}
+
+static int wxFontFamilyStringToInt(const wxString& family)
+{
+ if (family.empty())
+ return wxSWISS;
+
+ if (wxStrcmp(family, wxT("Roman")) == 0)
+ return wxROMAN;
+ else if (wxStrcmp(family, wxT("Decorative")) == 0)
+ return wxDECORATIVE;
+ else if (wxStrcmp(family, wxT("Modern")) == 0)
+ return wxMODERN;
+ else if (wxStrcmp(family, wxT("Script")) == 0)
+ return wxSCRIPT;
+ else if (wxStrcmp(family, wxT("Teletype")) == 0)
+ return wxTELETYPE;
+ else return wxSWISS;
+}
+
+static int wxFontStyleStringToInt(const wxString& style)
+{
+ if (style.empty())
+ return wxNORMAL;
+ if (wxStrcmp(style, wxT("Italic")) == 0)
+ return wxITALIC;
+ else if (wxStrcmp(style, wxT("Slant")) == 0)
+ return wxSLANT;
+ else
+ return wxNORMAL;
+}
+
+static int wxFontWeightStringToInt(const wxString& weight)
+{
+ if (weight.empty())
+ return wxNORMAL;
+ if (wxStrcmp(weight, wxT("Bold")) == 0)
+ return wxBOLD;
+ else if (wxStrcmp(weight, wxT("Light")) == 0)
+ return wxLIGHT;
+ else
+ return wxNORMAL;
+}
+
//-----------------------------------------------------------------------------
// wxGenericFontDialog
//-----------------------------------------------------------------------------
bool wxGenericFontDialog::DoCreate(wxWindow *parent)
{
- if ( !wxDialog::Create( parent , wxID_ANY , _T("Choose Font") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
- _T("fontdialog") ) )
+ parent = GetParentForModalDialog(parent, 0);
+
+ if ( !wxDialog::Create( parent , wxID_ANY , wxT("Choose Font") ,
+ wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
+ wxT("fontdialog") ) )
{
wxFAIL_MSG( wxT("wxFontDialog creation failed") );
return false;
wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
itemGridSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("&Font family:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+ itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
wxChoice* itemChoice7 = new wxChoice( this, wxID_FONT_FAMILY, wxDefaultPosition, wxDefaultSize, 5, families, 0 );
itemChoice7->SetHelpText(_("The font family."));
wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
itemGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
wxStaticText* itemStaticText9 = new wxStaticText( this, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+ itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
wxChoice* itemChoice10 = new wxChoice( this, wxID_FONT_STYLE, wxDefaultPosition, wxDefaultSize, 3, styles, 0 );
itemChoice10->SetHelpText(_("The font style."));
wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
itemGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
wxStaticText* itemStaticText12 = new wxStaticText( this, wxID_STATIC, _("&Weight:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+ itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
wxChoice* itemChoice13 = new wxChoice( this, wxID_FONT_WEIGHT, wxDefaultPosition, wxDefaultSize, 3, weights, 0 );
itemChoice13->SetHelpText(_("The font weight."));
if (m_fontData.GetEnableEffects())
{
wxStaticText* itemStaticText15 = new wxStaticText( this, wxID_STATIC, _("C&olour:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+ itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
wxSize colourSize = wxDefaultSize;
if (is_pda)
wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
itemGridSizer4->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5);
wxStaticText* itemStaticText18 = new wxStaticText( this, wxID_STATIC, _("&Point size:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+ itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
#if USE_SPINCTRL_FOR_POINT_SIZE
wxSpinCtrl* spinCtrl = new wxSpinCtrl(this, wxID_FONT_SIZE, wxT("12"), wxDefaultPosition, wxSize(80, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 500, 12);
itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxStaticText* itemStaticText23 = new wxStaticText( this, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
+ itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5);
wxFontPreviewer* itemWindow24 = new wxFontPreviewer( this );
m_previewer = itemWindow24;
if (m_colourChoice)
{
wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour()));
- if (name.length())
- m_colourChoice->SetStringSelection(name);
- else
+ if ( name.empty() )
m_colourChoice->SetStringSelection(wxT("BLACK"));
+ else
+ m_colourChoice->SetStringSelection(name);
}
if (m_underLineCheckBox)
int fontSize = 12;
bool fontUnderline = false;
- if (m_fontData.m_initialFont.Ok())
+ if (m_fontData.m_initialFont.IsOk())
{
fontFamily = m_fontData.m_initialFont.GetFamily();
fontWeight = m_fontData.m_initialFont.GetWeight();
{
if (!m_useEvents) return;
- int fontFamily = wxFontFamilyStringToInt(WXSTRINGCAST m_familyChoice->GetStringSelection());
- int fontWeight = wxFontWeightStringToInt(WXSTRINGCAST m_weightChoice->GetStringSelection());
- int fontStyle = wxFontStyleStringToInt(WXSTRINGCAST m_styleChoice->GetStringSelection());
+ int fontFamily = wxFontFamilyStringToInt(m_familyChoice->GetStringSelection());
+ int fontWeight = wxFontWeightStringToInt(m_weightChoice->GetStringSelection());
+ int fontStyle = wxFontStyleStringToInt(m_styleChoice->GetStringSelection());
#if USE_SPINCTRL_FOR_POINT_SIZE
wxSpinCtrl* fontSizeCtrl = wxDynamicCast(FindWindow(wxID_FONT_SIZE), wxSpinCtrl);
int fontSize = fontSizeCtrl->GetValue();
if ( !m_colourChoice->GetStringSelection().empty() )
{
wxColour col = wxTheColourDatabase->Find(m_colourChoice->GetStringSelection());
- if (col.Ok())
+ if (col.IsOk())
{
m_fontData.m_fontColour = col;
}
}
// Update color here so that we can also use the color originally passed in
// (EnableEffects may be false)
- if (m_fontData.m_fontColour.Ok())
+ if (m_fontData.m_fontColour.IsOk())
m_previewer->SetForegroundColour(m_fontData.m_fontColour);
m_previewer->Refresh();
}
#endif
-const wxChar *wxFontWeightIntToString(int weight)
-{
- switch (weight)
- {
- case wxLIGHT:
- return wxT("Light");
- case wxBOLD:
- return wxT("Bold");
- case wxNORMAL:
- default:
- return wxT("Normal");
- }
-}
-
-const wxChar *wxFontStyleIntToString(int style)
-{
- switch (style)
- {
- case wxITALIC:
- return wxT("Italic");
- case wxSLANT:
- return wxT("Slant");
- case wxNORMAL:
- default:
- return wxT("Normal");
- }
-}
-
-const wxChar *wxFontFamilyIntToString(int family)
-{
- switch (family)
- {
- case wxROMAN:
- return wxT("Roman");
- case wxDECORATIVE:
- return wxT("Decorative");
- case wxMODERN:
- return wxT("Modern");
- case wxSCRIPT:
- return wxT("Script");
- case wxTELETYPE:
- return wxT("Teletype");
- case wxSWISS:
- default:
- return wxT("Swiss");
- }
-}
-
-int wxFontFamilyStringToInt(wxChar *family)
-{
- if (!family)
- return wxSWISS;
-
- if (wxStrcmp(family, wxT("Roman")) == 0)
- return wxROMAN;
- else if (wxStrcmp(family, wxT("Decorative")) == 0)
- return wxDECORATIVE;
- else if (wxStrcmp(family, wxT("Modern")) == 0)
- return wxMODERN;
- else if (wxStrcmp(family, wxT("Script")) == 0)
- return wxSCRIPT;
- else if (wxStrcmp(family, wxT("Teletype")) == 0)
- return wxTELETYPE;
- else return wxSWISS;
-}
-
-int wxFontStyleStringToInt(wxChar *style)
-{
- if (!style)
- return wxNORMAL;
- if (wxStrcmp(style, wxT("Italic")) == 0)
- return wxITALIC;
- else if (wxStrcmp(style, wxT("Slant")) == 0)
- return wxSLANT;
- else
- return wxNORMAL;
-}
-
-int wxFontWeightStringToInt(wxChar *weight)
-{
- if (!weight)
- return wxNORMAL;
- if (wxStrcmp(weight, wxT("Bold")) == 0)
- return wxBOLD;
- else if (wxStrcmp(weight, wxT("Light")) == 0)
- return wxLIGHT;
- else
- return wxNORMAL;
-}
-
#endif
// wxUSE_FONTDLG
projects / wxWidgets.git / blobdiff