diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index be8de8a803..01908fbde5 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -994,6 +994,15 @@ samples/calendar/*.ico samples/calendar/*.xpm samples/calendar/*.txt +samples/exec/*.cpp +samples/exec/*.h +samples/exec/makefile* +samples/exec/*.rc +samples/exec/*.def +samples/exec/*.ico +samples/exec/*.xpm +samples/exec/*.txt + demos/bombs/*.cpp demos/bombs/*.h demos/bombs/*.def diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index 059a8f9199..56a59cfd9a 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -48,6 +48,7 @@ samples/font/Makefile.in samples/menu/Makefile.in samples/console/Makefile.in samples/calendar/Makefile.in +samples/exec/Makefile.in demos/bombs/Makefile.in demos/forty/Makefile.in demos/fractal/Makefile.in diff --git a/docs/bugs.txt b/docs/bugs.txt index db2b75abb0..91846d9b6a 100644 --- a/docs/bugs.txt +++ b/docs/bugs.txt @@ -348,6 +348,37 @@ lpszPortName visitor_email_address: ave@relex.ru wxWINDOWS+VERSION: 2.1.11 +DATE+FIXED: +DATE+IDENTIFIED: 14/01/2000 +DETAILS: I run my linux boxes headless and use a Windows box for an XServer... every sample I have tried so far +hangs in a loop tring to get an acceptable font for something or other... here is the GDB trace +#1102 0x40203d19 in wxMessageBox () +#1103 0x401aee31 in wxFontMapper::GetAltForEncoding () +#1104 0x40287c45 in wxLoadQueryNearestFont () +#1105 0x4015b3cc in wxFont::GetInternalFont () +#1106 0x4017d1db in wxWindow::GetTextExtent () +#1107 0x4018f499 in wxDialogBase::CreateTextSizer () +#1108 0x40253302 in wxGenericMessageDialog::wxGenericMessageDialog () +#1109 0x40203d19 in wxMessageBox () +#1110 0x401aee31 in wxFontMapper::GetAltForEncoding () +#1111 0x40287c45 in wxLoadQueryNearestFont () +#1112 0x4015b3cc in wxFont::GetInternalFont () +#1113 0x40154653 in wxWindowDC::DoGetTextExtent () +#1114 0x4015e3fd in wxFrame::OnCreateStatusBar () +#1115 0x4015e17d in wxFrame::CreateStatusBar () +#1116 0x8062edc in ChatFrame::ChatFrame () +#1117 0x8062d3d in ChatClient::OnInit () +#1118 0x4014587e in wxEntry () +#1119 0x401617db in main () +FIXED+BY: +IDENTIFIED+BY: John Barrett +PLATFORMS: wxGTK +SHORT+DESCRIPTION: wxWin/GTK and X-Win32 on Windows +Submit: Submit +WORKAROUND: +visitor_email_address: jbarrett@box100.com +wxWINDOWS+VERSION: 2.1.11 + ---------------------------END OF BUGLIST------------------------- diff --git a/docs/html/index.htm b/docs/html/index.htm index 3f1208b938..f67ba3dc60 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -183,6 +183,7 @@ using wxMDIParentFrame, wxMDIChildFrame.
  • drawing: tests device context drawing.
  • dynamic: shows how to connect events to member functions dynamically. +
  • exec: demonstrates wxExecute.
  • font: tests fonts, font enumerator, font encodings.
  • grid: demonstrates the wxGrid class.
  • help: shows how to use wxHelpController. diff --git a/src/common/resource.cpp b/src/common/resource.cpp index 19ffdaef1b..c32447bfa7 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -908,11 +908,11 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr) if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) { - // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); - // Do nothing - no label font any more - count ++; - if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList) - controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); + // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count))); + // Skip past the obsolete label font spec if there are two consecutive specs + if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList) + count ++; + controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count))); } } } diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index 15a63fc233..748ac446be 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -221,6 +221,7 @@ void MyApp::GenerateSamples(const wxString& dir) wxStringList("docview.cpp", "doc.cpp", "view.cpp", "docview.h", "doc.h", "view.h", 0)); GenerateSample("DynamicVC", "dynamic", dir + wxString("/samples/dynamic"), wxStringList("dynamic.cpp", 0)); GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0)); + GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0)); GenerateSample("GridVC", "test", dir + wxString("/samples/grid"), wxStringList("test.cpp", 0)); GenerateSample("NewGridVC", "griddemo", dir + wxString("/samples/newgrid"), wxStringList("griddemo.cpp", 0)); GenerateSample("HelpVC", "demo", dir + wxString("/samples/help"), wxStringList("demo.cpp", 0)); @@ -312,7 +313,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("DialogEdVC"); project.SetTargetName("dialoged"); @@ -334,7 +335,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("Tex2RTFVC"); project.SetTargetName("tex2rtf"); @@ -355,7 +356,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("HelpGenVC"); project.SetTargetName("helpgen"); @@ -377,7 +378,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../include", 0)); project.SetLibDirs(wxStringList("../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../src/Debug", "../../src/jpeg/Debug", "../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../src/Release", "../../src/jpeg/Release", "../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../src/Release", "../../src/jpeg/Release", "../../src/tiff/Release", 0)); project.SetProjectName("ProjGenVC"); project.SetTargetName("makeproj"); @@ -396,7 +397,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../include", 0)); project.SetLibDirs(wxStringList("../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../src/Debug", "../../../src/jpeg/Debug", "../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../src/Release", "../../../src/jpeg/Release", "../../../src/tiff/Release", 0)); project.SetProjectName("TreeSampleVC"); project.SetTargetName("test"); @@ -415,7 +416,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../src/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", "../../../../src/jpeg/Release", "../../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("ogl.lib", 0)); @@ -438,7 +439,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../src/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", "../../../../src/jpeg/Release", "../../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../src/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("ogl.lib", 0)); project.SetProjectName("StudioVC"); @@ -462,7 +463,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); @@ -484,7 +485,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); project.SetProjectName("IsoSurfVC"); @@ -505,7 +506,7 @@ void MyApp::GenerateSamples(const wxString& dir) project.SetResourceIncludeDirs(wxStringList("../../../../include", 0)); project.SetLibDirs(wxStringList("../../../../lib", 0)); project.SetDebugLibDirs(wxStringList("../../../../src/Debug", "../../win/Debug", "../../../../src/jpeg/Debug", "../../../../src/tiff/Debug", 0)); - project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../tiff/Release", 0)); + project.SetReleaseLibDirs(wxStringList("../../../../src/Release", "../../win/Release", "../../../../src/jpeg/Release", "../../../../src/tiff/Release", 0)); project.SetExtraLibs(wxStringList("glcanvas.lib", "opengl32.lib", "glu32.lib", 0)); project.SetProjectName("PenguinVC");