Backported Unicode compilation fixes for demos and exec sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -206,7 +206,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
|
||||
dc->SetFont(* NormalFont);
|
||||
long xx;
|
||||
long yy;
|
||||
dc->GetTextExtent("X", &xx, &yy);
|
||||
dc->GetTextExtent(_T("X"), &xx, &yy);
|
||||
char_height = (int)yy;
|
||||
|
||||
if (current_page == 0)
|
||||
@@ -844,9 +844,11 @@ int GetIndex()
|
||||
// Read preferences
|
||||
void ReadPreferences()
|
||||
{
|
||||
#if wxUSE_RESOURCES
|
||||
wxGetResource("wxPoem", "FontSize", &pointSize);
|
||||
wxGetResource("wxPoem", "X", &XPos);
|
||||
wxGetResource("wxPoem", "Y", &YPos);
|
||||
#endif
|
||||
}
|
||||
|
||||
// Write preferences to disk
|
||||
@@ -854,10 +856,12 @@ void WritePreferences()
|
||||
{
|
||||
#ifdef __WXMSW__
|
||||
TheMainWindow->GetPosition(&XPos, &YPos);
|
||||
#if wxUSE_RESOURCES
|
||||
wxWriteResource("wxPoem", "FontSize", pointSize);
|
||||
wxWriteResource("wxPoem", "X", XPos);
|
||||
wxWriteResource("wxPoem", "Y", YPos);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
// Load a poem from given file, at given point in file.
|
||||
|
Reference in New Issue
Block a user