Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed internal compiler error and proper translation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-11-25 15:10:45 +00:00
parent b9fc7b7fdd
commit 59043ba230
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/generic/fontdlgg.cpp
View File

@@ -197,15 +197,28 @@ void wxGenericFontDialog::CreateWidgets(void)
fontRect.width = 350; fontRect.width = 350;
fontRect.height = 100; fontRect.height = 100;
/* /*
static char *families[] = { "Roman", "Decorative", "Modern", "Script", "Swiss" }; static char *families[] = { "Roman", "Decorative", "Modern", "Script", "Swiss" };
static char *styles[] = { "Normal", "Italic", "Slant" }; static char *styles[] = { "Normal", "Italic", "Slant" };
static char *weights[] = { "Normal", "Light", "Bold" }; static char *weights[] = { "Normal", "Light", "Bold" };
*/ */
static wxString families[] = { "Roman", "Decorative", "Modern", "Script", "Swiss" };
static wxString styles[] = { "Normal", "Italic", "Slant" }; wxString
static wxString weights[] = { "Normal", "Light", "Bold" }; *families = new wxString[5],
*styles = new wxString[3],
*weights = new wxString[3];
families[0] = _("Roman");
families[1] = _("Decorative");
families[2] = _("Modern");
families[3] = _("Script");
families[4] = _("Swiss" );
styles[0] = _("Normal");
styles[1] = _("Italic");
styles[2] = _("Slant");
weights[0] = _("Normal");
weights[1] = _("Light");
weights[2] = _("Bold");
int x=-1; int x=-1;
int y=40; int y=40;
familyChoice = new wxChoice(this, wxID_FONT_FAMILY, wxPoint(10, 10), wxSize(120, -1), 5, families); familyChoice = new wxChoice(this, wxID_FONT_FAMILY, wxPoint(10, 10), wxSize(120, -1), 5, families);
@@ -219,7 +232,7 @@ void wxGenericFontDialog::CreateWidgets(void)
y+=3; //NL mod y+=3; //NL mod
#endif #endif
wxString pointSizes[40]; wxString *pointSizes = new wxString[40];
int i; int i;
for ( i = 0; i < 40; i++) for ( i = 0; i < 40; i++)
{ {
@@ -262,7 +275,11 @@ void wxGenericFontDialog::CreateWidgets(void)
Centre(wxBOTH); Centre(wxBOTH);
wxEndBusyCursor(); wxEndBusyCursor();
delete[] families;
delete[] styles;
delete[] weights;
delete[] pointSizes;
m_useEvents = TRUE; m_useEvents = TRUE;
} }