#include "wx/listbox.h"
#endif
-#include "wx/fontenum.h"
#include "wx/dcbuffer.h"
+// Only for cached font name
+#include "wx/richtext/richtextctrl.h"
+
/* Microsoft Unicode subset numbering
*/
{
int m_low, m_high;
wxUnicodeSubsetCodes m_subset;
- wxChar* m_name;
+ const wxChar* m_name;
} g_UnicodeSubsetTable[] =
{
{ 0x0000, 0x007E,
}
#endif
+bool wxSymbolPickerDialog::sm_showToolTips = false;
+
/*!
* wxSymbolPickerDialog type definition
*/
EVT_COMBOBOX( ID_SYMBOLPICKERDIALOG_FROM, wxSymbolPickerDialog::OnFromUnicodeSelected )
#endif
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOS2__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
- EVT_UPDATE_UI( wxID_OK, wxSymbolPickerDialog::OnOkUpdate )
-#endif
-
-#if defined(__WXMAC__)
EVT_UPDATE_UI( wxID_OK, wxSymbolPickerDialog::OnOkUpdate )
-#endif
////@end wxSymbolPickerDialog event table entries
m_symbol = symbol;
////@begin wxSymbolPickerDialog creation
- SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS|wxDIALOG_EX_CONTEXTHELP);
+ SetExtraStyle(wxWS_EX_BLOCK_EVENTS|wxDIALOG_EX_CONTEXTHELP);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
itemBoxSizer4->Add(itemBoxSizer5, 1, wxGROW, 5);
wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Font:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
-
- wxString* m_fontCtrlStrings = NULL;
- m_fontCtrl = new wxComboBox( itemDialog1,
- ID_SYMBOLPICKERDIALOG_FONT,
- wxEmptyString,
- wxDefaultPosition,
- wxSize(240, wxDefaultCoord),
- 0,
- m_fontCtrlStrings,
- wxCB_READONLY );
+ itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ wxArrayString m_fontCtrlStrings;
+ m_fontCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FONT, _T(""), wxDefaultPosition, wxSize(240, -1), m_fontCtrlStrings, wxCB_READONLY );
+ m_fontCtrl->SetHelpText(_("The font from which to take the symbol."));
+ if (wxSymbolPickerDialog::ShowToolTips())
+ m_fontCtrl->SetToolTip(_("The font from which to take the symbol."));
itemBoxSizer5->Add(m_fontCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer5->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#if defined(__UNICODE__)
wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Subset:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer5->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
+ itemBoxSizer5->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
#if defined(__UNICODE__)
- wxString* m_subsetCtrlStrings = NULL;
- m_subsetCtrl = new wxComboBox( itemDialog1,
- ID_SYMBOLPICKERDIALOG_SUBSET,
- wxEmptyString,
- wxDefaultPosition,
- wxDefaultSize,
- 0,
- m_subsetCtrlStrings,
- wxCB_READONLY );
+ wxArrayString m_subsetCtrlStrings;
+ m_subsetCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_SUBSET, _T(""), wxDefaultPosition, wxDefaultSize, m_subsetCtrlStrings, wxCB_READONLY );
m_subsetCtrl->SetHelpText(_("Shows a Unicode subset."));
- if (ShowToolTips())
+ if (wxSymbolPickerDialog::ShowToolTips())
m_subsetCtrl->SetToolTip(_("Shows a Unicode subset."));
itemBoxSizer5->Add(m_subsetCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
- m_symbolsCtrl = new wxSymbolListCtrl( itemDialog1, ID_SYMBOLPICKERDIALOG_LISTCTRL, wxDefaultPosition, wxSize(500, 240), wxSIMPLE_BORDER );
+ m_symbolsCtrl = new wxSymbolListCtrl( itemDialog1, ID_SYMBOLPICKERDIALOG_LISTCTRL, wxDefaultPosition, wxSize(500, 200), 0 );
itemBoxSizer3->Add(m_symbolsCtrl, 1, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer3->Add(itemBoxSizer12, 0, wxGROW, 5);
- m_symbolStaticCtrl = new wxStaticText( itemDialog1, wxID_STATIC, _("xxxx"), wxDefaultPosition, wxSize(40, wxDefaultCoord), wxALIGN_CENTRE );
- itemBoxSizer12->Add(m_symbolStaticCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
+ m_symbolStaticCtrl = new wxStaticText( itemDialog1, wxID_STATIC, _("xxxx"), wxDefaultPosition, wxSize(40, -1), wxALIGN_CENTRE );
+ itemBoxSizer12->Add(m_symbolStaticCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer12->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Character code:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer12->Add(itemStaticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
-
- m_characterCodeCtrl = new wxTextCtrl( itemDialog1,
- ID_SYMBOLPICKERDIALOG_CHARACTERCODE,
- wxEmptyString,
- wxDefaultPosition,
- wxSize(140, wxDefaultCoord),
- wxTE_READONLY|wxTE_CENTRE );
+ itemBoxSizer12->Add(itemStaticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+
+ m_characterCodeCtrl = new wxTextCtrl( itemDialog1, ID_SYMBOLPICKERDIALOG_CHARACTERCODE, _T(""), wxDefaultPosition, wxSize(140, -1), wxTE_READONLY|wxTE_CENTRE );
+ m_characterCodeCtrl->SetHelpText(_("The character code."));
+ if (wxSymbolPickerDialog::ShowToolTips())
+ m_characterCodeCtrl->SetToolTip(_("The character code."));
itemBoxSizer12->Add(m_characterCodeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer12->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#if defined(__UNICODE__)
wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("&From:"), wxDefaultPosition, wxDefaultSize, 0 );
- itemBoxSizer12->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
+ itemBoxSizer12->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
#if defined(__UNICODE__)
- wxString m_fromUnicodeCtrlStrings[] = {
- _("ASCII"),
- _("Unicode")
- };
- m_fromUnicodeCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FROM, _("ASCII"), wxDefaultPosition, wxDefaultSize, 2, m_fromUnicodeCtrlStrings, wxCB_READONLY );
+ wxArrayString m_fromUnicodeCtrlStrings;
+ m_fromUnicodeCtrlStrings.Add(_("ASCII"));
+ m_fromUnicodeCtrlStrings.Add(_("Unicode"));
+ m_fromUnicodeCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FROM, _("ASCII"), wxDefaultPosition, wxDefaultSize, m_fromUnicodeCtrlStrings, wxCB_READONLY );
m_fromUnicodeCtrl->SetStringSelection(_("ASCII"));
+ m_fromUnicodeCtrl->SetHelpText(_("The range to show."));
+ if (wxSymbolPickerDialog::ShowToolTips())
+ m_fromUnicodeCtrl->SetToolTip(_("The range to show."));
itemBoxSizer12->Add(m_fromUnicodeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
#endif
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOS2__) || defined(__WXMGL__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || defined(__WXX11__) || defined(__WXPALMOS__)
wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
itemBoxSizer3->Add(itemBoxSizer20, 0, wxGROW, 5);
itemBoxSizer20->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
- wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("Insert"), wxDefaultPosition, wxDefaultSize, 0 );
- itemButton22->SetDefault();
- itemButton22->SetHelpText(_("Inserts the chosen symbol."));
- if (ShowToolTips())
- itemButton22->SetToolTip(_("Inserts the chosen symbol."));
- itemBoxSizer20->Add(itemButton22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
- wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
- itemButton23->SetHelpText(_("Closes the dialog without inserting a symbol."));
- if (ShowToolTips())
- itemButton23->SetToolTip(_("Closes the dialog without inserting a symbol."));
- itemBoxSizer20->Add(itemButton23, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-#endif
-
-#if defined(__WXMAC__)
- wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL);
- itemBoxSizer3->Add(itemBoxSizer24, 0, wxGROW, 5);
+ wxStdDialogButtonSizer* itemStdDialogButtonSizer22 = new wxStdDialogButtonSizer;
- itemBoxSizer24->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ itemBoxSizer20->Add(itemStdDialogButtonSizer22, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5);
+ wxButton* itemButton23 = new wxButton( itemDialog1, wxID_OK, _("Insert"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemButton23->SetDefault();
+ itemStdDialogButtonSizer22->AddButton(itemButton23);
- wxButton* itemButton26 = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
- itemButton26->SetHelpText(_("Closes the dialog without inserting a symbol."));
- if (ShowToolTips())
- itemButton26->SetToolTip(_("Closes the dialog without inserting a symbol."));
- itemBoxSizer24->Add(itemButton26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
+ wxButton* itemButton24 = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+ itemStdDialogButtonSizer22->AddButton(itemButton24);
- wxButton* itemButton27 = new wxButton( itemDialog1, wxID_OK, _("Insert"), wxDefaultPosition, wxDefaultSize, 0 );
- itemButton27->SetDefault();
- itemButton27->SetHelpText(_("Inserts the chosen symbol."));
- if (ShowToolTips())
- itemButton27->SetToolTip(_("Inserts the chosen symbol."));
- itemBoxSizer24->Add(itemButton27, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
-
-#endif
+ itemStdDialogButtonSizer22->Realize();
////@end wxSymbolPickerDialog content construction
if (m_fontCtrl->GetCount() == 0)
{
- wxArrayString faceNames = wxFontEnumerator::GetFacenames();
+ wxArrayString faceNames = wxRichTextCtrl::GetAvailableFontNames();
faceNames.Sort();
faceNames.Insert(_("(Normal text)"), 0);
}
-/*!
- * Should we show tooltips?
- */
-
-bool wxSymbolPickerDialog::ShowToolTips()
-{
- return true;
-}
-
/*!
* Get bitmap resources
*/
const wxString& name)
{
style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
+
+ if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
+ style |= wxBORDER_THEME;
+
if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) )
return false;
}
if ( m_current != wxNOT_FOUND )
- RefreshLine(SymbolValueToLineNumber(m_current));
+ RefreshRow(SymbolValueToLineNumber(m_current));
m_current = current;
// don't need to refresh it -- it will be redrawn anyhow
if ( !IsVisible(lineNo) )
{
- ScrollToLine(lineNo);
+ ScrollToRow(lineNo);
}
else // line is at least partly visible
{
// it is, indeed, only partly visible, so scroll it into view to
// make it entirely visible
- while ( unsigned(lineNo) == GetLastVisibleLine() &&
- ScrollToLine(GetVisibleBegin()+1) )
+ while ( (unsigned)lineNo + 1 == GetVisibleEnd() &&
+ ScrollToRow(GetVisibleBegin() + 1) )
;
// but in any case refresh it as even if it was only partly visible
// before we need to redraw it entirely as its background changed
- RefreshLine(lineNo);
+ RefreshRow(lineNo);
}
}
// wxSymbolListCtrl painting
// ----------------------------------------------------------------------------
-wxCoord wxSymbolListCtrl::OnGetLineHeight(size_t WXUNUSED(line)) const
+wxCoord wxSymbolListCtrl::OnGetRowHeight(size_t WXUNUSED(line)) const
{
return m_cellSize.y + 2*m_ptMargins.y + 1 /* for divider */ ;
}
dc.SetFont(GetFont());
// the bounding rectangle of the current line
- wxRect rectLine;
- rectLine.width = clientSize.x;
+ wxRect rectRow;
+ rectRow.width = clientSize.x;
dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)));
dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
// iterate over all visible lines
const size_t lineMax = GetVisibleEnd();
- for ( size_t line = GetFirstVisibleLine(); line < lineMax; line++ )
+ for ( size_t line = GetVisibleBegin(); line < lineMax; line++ )
{
- const wxCoord hLine = OnGetLineHeight(line);
+ const wxCoord hRow = OnGetRowHeight(line);
- rectLine.height = hLine;
+ rectRow.height = hRow;
// and draw the ones which intersect the update rect
- if ( rectLine.Intersects(rectUpdate) )
+ if ( rectRow.Intersects(rectUpdate) )
{
// don't allow drawing outside of the lines rectangle
- wxDCClipper clip(dc, rectLine);
+ wxDCClipper clip(dc, rectRow);
- wxRect rect = rectLine;
+ wxRect rect = rectRow;
rect.Deflate(m_ptMargins.x, m_ptMargins.y);
OnDrawItem(dc, rect, line);
}
else // no intersection
{
- if ( rectLine.GetTop() > rectUpdate.GetBottom() )
+ if ( rectRow.GetTop() > rectUpdate.GetBottom() )
{
// we are already below the update rect, no need to continue
// further
//else: the next line may intersect the update rect
}
- rectLine.y += hLine;
+ rectRow.y += hRow;
}
}
m_symbolsPerLine = sz.x/(m_cellSize.x+m_ptMargins.x);
int noLines = (1 + SymbolValueToLineNumber(m_maxSymbolValue));
- SetLineCount(noLines);
+ SetRowCount(noLines);
Refresh();
if (scrollToSelection && m_current != wxNOT_FOUND && m_current >= m_minSymbolValue && m_current <= m_maxSymbolValue)
{
- ScrollToLine(SymbolValueToLineNumber(m_current));
+ ScrollToRow(SymbolValueToLineNumber(m_current));
}
}
{
if (item != wxNOT_FOUND && item >= m_minSymbolValue && item <= m_maxSymbolValue)
{
- ScrollToLine(SymbolValueToLineNumber(item));
+ ScrollToRow(SymbolValueToLineNumber(item));
}
}
// hit testing
int wxSymbolListCtrl::HitTest(const wxPoint& pt)
{
- wxCoord lineHeight = OnGetLineHeight(0);
+ wxCoord lineHeight = OnGetRowHeight(0);
int atLine = GetVisibleBegin() + (pt.y/lineHeight);
int symbol = (atLine*m_symbolsPerLine) + (pt.x/(m_cellSize.x+1));
projects / wxWidgets.git / blobdiff