From 6b8b0e7ca05ae2ea581601c4510f7c5704c22607 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 30 Nov 1999 10:07:03 +0000 Subject: [PATCH] Compile fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/patch.rsp | 11 ++ distrib/msw/zippatch.bat | 9 +- docs/bugs.txt | 162 ++++++++++++++++++++++++++ src/msw/filedlg.cpp | 6 +- src/msw/mdi.cpp | 1 - utils/dialoged/src/dialoged.h | 2 +- utils/ogl/samples/ogledit/palette.cpp | 5 - utils/ogl/samples/studio/shapes.cpp | 9 ++ utils/ogl/samples/studio/shapes.h | 10 ++ utils/ogl/samples/studio/studio.cpp | 2 +- 10 files changed, 202 insertions(+), 15 deletions(-) diff --git a/distrib/msw/patch.rsp b/distrib/msw/patch.rsp index 2f8d9ba886..80185ac474 100644 --- a/distrib/msw/patch.rsp +++ b/distrib/msw/patch.rsp @@ -3,3 +3,14 @@ include/wx/msw/setup.h samples/dnd/*.wxr src/unix/fontutil.cpp src/common/fontmap.cpp +src/msw/statbox.cpp +include/wx/msw/statbox.h +utils/ogl/samples/ogledit/palette.cpp +utils/ogl/samples/studio/shapes.cpp +utils/ogl/samples/studio/shapes.h +utils/ogl/samples/studio/studio.h +utils/dialoged/src/dialoged.cpp +utils/dialoged/src/dlghndlr.cpp +utils/dialoged/src/reseditr.cpp +utils/dialoged/src/dialoged.h + diff --git a/distrib/msw/zippatch.bat b/distrib/msw/zippatch.bat index a0aaa23855..37742c7514 100755 --- a/distrib/msw/zippatch.bat +++ b/distrib/msw/zippatch.bat @@ -1,11 +1,12 @@ @echo off rem Zip up a patch file -set src=%wxwin -set dest=%src\deliver +Rem m:\wx2 contains the latest version + any crucial patches +set src=m:\wx2 +set dest=%wxwin\deliver set wise=0 Rem Set this to the required patch version -set version=02 +set version=03 if "%src" == "" goto usage if "%dest" == "" goto usage @@ -21,7 +22,7 @@ erase %dest\patch*.zip cd %src echo Zipping... -zip32 -@ %dest\patch%version%.zip < %src\distrib\msw\patch.rsp +zip32 -@ %dest\patch%version%.zip < %wxwin\distrib\msw\patch.rsp echo wxWindows patch archived. cd %dest diff --git a/docs/bugs.txt b/docs/bugs.txt index 1ffb7e1588..b4cdcfd309 100644 --- a/docs/bugs.txt +++ b/docs/bugs.txt @@ -127,6 +127,168 @@ PLATFORMS: wxGTK DATE IDENTIFIED: 16/11/1999 IDENTIFIED BY: Randall Hopper +DATE+FIXED: +DATE+IDENTIFIED: 11-15-99 +DETAILS: I am a new user. I downloaded setup.exe and setup.wXX then ran the install program. It prompted me for disk two which puzzled me. There was no obvious solution. +FIXED+BY: +IDENTIFIED+BY: William Deans +PLATFORMS: wxWindows +SHORT+DESCRIPTION: misnamed setup.wXX files prevents install +Submit: Submit +WORKAROUND: The problem seems to be that the default download name for the setup.wXX files is not 'setup.wXX' but instead 'setup.wXX..wXX' Every new user who installs could change these names... but why not simply change them on the server? (I was using IE 5 under Windows 98) +visitor_email_address: willdeans@mindspring.com +wxWINDOWS+VERSION: Current version as of 11-15-99 + +DATE+FIXED: +DATE+IDENTIFIED: 11-15-99 +DETAILS: to recreate: + click "new dialog" several times + view the properties of a dialog box + DO NOT CLOSE THE PROPERTIES BOX + click on another dialog in the list + right click the new dialog and select view properties..... (THE PROPERTY BOX DOES NOT CHANGE EVEN THOUGH IT SHOULD!... BUT THIS IS NOT THE CRASH) + to make the crash click the Name property in the properties dialog box -- the application crashes +FIXED+BY: +IDENTIFIED+BY: William Deans +PLATFORMS: wxWindows +SHORT+DESCRIPTION: dialog editor CRASHES +Submit: Submit +WORKAROUND: be sure and close the properties box every time before switching to a new dialog... this might be hard to remember as the properties box does not stay in front of the dialog editor........ as I feel that it should +visitor_email_address: willdeans@mindspring.com +wxWINDOWS+VERSION: 2.1.11 (Current version as of 11-15-99) + +DATE+FIXED: +DATE+IDENTIFIED: 11-15-99 +DETAILS: to recreate: + click "Dialogs" folder to the left + select delete from the menu +FIXED+BY: +IDENTIFIED+BY: William Deans +PLATFORMS: wxWindows +SHORT+DESCRIPTION: Dialog Editor CRASHES (again) +Submit: Submit +WORKAROUND: +visitor_email_address: willdeans@mindspring.com +wxWINDOWS+VERSION: 2.1.11 (Current version as of 11-15-99) + +DATE+FIXED: +DATE+IDENTIFIED: 11-15-99 +DETAILS: to recreate: + go to properties (of any dialog) + select id + select ... + hit cancel + the property box hangs +FIXED+BY: +IDENTIFIED+BY: William Deans +PLATFORMS: wxWindows +SHORT+DESCRIPTION: Dialog Editor HANGS +Submit: Submit +WORKAROUND: +visitor_email_address: willdeans@mindspring.com +wxWINDOWS+VERSION: 2.1.11 (Current version as of 11-15-99) + +DATE+FIXED: +DATE+IDENTIFIED: 11-15-99 +DETAILS: to recreate: + put a space into the name field of the property box...... this should be disallowed, but is not +FIXED+BY: +IDENTIFIED+BY: William Deans +PLATFORMS: wxWindows +SHORT+DESCRIPTION: Dialog Editor Creates Files It Cannot Parse +Submit: Submit +WORKAROUND: each time a change is made to a dialog..... that section of the wxr file should be written to a buffer and re-parsed..... if the parsing fails the change should be disallowed +visitor_email_address: willdeans@mindspring.com +wxWINDOWS+VERSION: 2.1.11 (Current version as of 11-15-99) + +DATE+IDENTIFIED: 26/11/1999 +DETAILS: Around line 1234 or the common/docview.cpp file following code exists... + +if (!theTemplate) + theTemplate=templates[FilterIndex] ; + +The problem is tat FilterIndex is one based and the templates array is zero based. The correct +thing might be to use FilterIndex-1 as the index. Else the following scenario will +cause a crash. + +1. Use the docvsmdi example +2. Bring up the file open dlg. +3. Select Files of Type "Text" +4. c:\autoexec.bat for file name +5. Press okay and you should see + the crash. + +I understand that it is very +hard to figure out the template +when the user does not select +one of the known extensions but +this simple fix might atleast +avoid the crash.... + +I started playing with wxMSW +just this morning and have not +yet figured out exactly how to +submit a fix. I atleast wanted +to report it. Besides what I do +for the MSW might not be correct +for the other platforms :-) + +Note from JACS: fixed (I hope) by making m_filterIndex +zero-based in MSW wxFileDialog implementation +(it's zero-based in wxGTK/the generic dialog). + +IDENTIFIED+BY: Haneef Mohammed +PLATFORMS: wxMSW +SHORT+DESCRIPTION: Bug in wxDocTemplate::SelectDocumentPath() +Submit: Submit +WORKAROUND: +visitor_email_address: haneef@symphonyeda.com +wxWINDOWS+VERSION: 2.1.12 +DATE+FIXED: 29/11/99 +FIXED+BY: Julian Smart + +DATE+FIXED: +DATE+IDENTIFIED: 29/11/1999 +DETAILS: wxGTK cannot seem to find the default font +on (some?) Debian 2.x systems. This results +in infinite recursion in wxLoadQueryNearestFont. + +It only happens on one of my two Debian machines, +but I haven't investigated thoroughly enough to give +any more detail. + +I have made a temporary workaround by trapping +recursion in wxLoadQueryNearestFont with a static +bool flag. + +I will investigate the problem further if this bug has +not already been reported by someone else. +FIXED+BY: Vadim, just after 2.1.11? +IDENTIFIED+BY: Tom Marshall +PLATFORMS: wxGTK +SHORT+DESCRIPTION: wxGTK: infinite recursion in font selection +Submit: Submit +WORKAROUND: Create default font mapping for every +wxGTK app (?) +visitor_email_address: tommy@aa.net +wxWINDOWS+VERSION: 2.1.11 + +DATE+FIXED: +DATE+IDENTIFIED: 29/11/1999 +DETAILS: If the listening socket cannot be obtained +(ie, TIME_WAIT) the wxsocket server example +program segfaults. +FIXED+BY: +IDENTIFIED+BY: Tom Marshall +PLATFORMS: wxGTK +SHORT+DESCRIPTION: wxGTK: wxsocket example crashes if listen socket unavailable +Submit: Submit +WORKAROUND: None. +visitor_email_address: tommy@aa.net +wxWINDOWS+VERSION: 2.1.11 + + + ---------------------------END OF BUGLIST------------------------- diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 1cd0d4355c..acdf6567db 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -185,7 +185,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, m_fileName = defaultFileName; m_dir = defaultDir; m_wildCard = wildCard; - m_filterIndex = 1; + m_filterIndex = 0; } int wxFileDialog::ShowModal(void) @@ -274,7 +274,7 @@ int wxFileDialog::ShowModal(void) } of.lpstrFilter = (LPTSTR)(const wxChar *)filterBuffer; - of.nFilterIndex = m_filterIndex; + of.nFilterIndex = m_filterIndex + 1; // m_filterIndex is zero-based, but nFilterIndex is 1-based //=== Setting defaultFileName >>========================================= @@ -295,7 +295,7 @@ int wxFileDialog::ShowModal(void) //=== Adding the correct extension >>================================= - m_filterIndex = (int)of.nFilterIndex; + m_filterIndex = wxMax((int)of.nFilterIndex - 1, 0); if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.') ) { // user has typed an filename diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index f91d0a6cb3..6e9e158a32 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -212,7 +212,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent, wxMDIParentFrame::~wxMDIParentFrame() { DestroyChildren(); - // already delete by DestroyChildren() m_frameToolBar = NULL; diff --git a/utils/dialoged/src/dialoged.h b/utils/dialoged/src/dialoged.h index fae9807806..72abac89c1 100644 --- a/utils/dialoged/src/dialoged.h +++ b/utils/dialoged/src/dialoged.h @@ -33,7 +33,7 @@ class MyApp: public wxApp void OnObjectPopupMenu(wxCommandEvent& event) { - return ObjectMenuProc((wxMenu *)event.GetEventObject(), event); + ObjectMenuProc((wxMenu *)event.GetEventObject(), event); } private: diff --git a/utils/ogl/samples/ogledit/palette.cpp b/utils/ogl/samples/ogledit/palette.cpp index b41ef0ff25..db113f31ef 100644 --- a/utils/ogl/samples/ogledit/palette.cpp +++ b/utils/ogl/samples/ogledit/palette.cpp @@ -105,11 +105,6 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent) palette->SetMargins(2, 2); -#ifdef __WXMSW__ - if (palette->IsKindOf(CLASSINFO(wxToolBar95))) - ((wxToolBar95 *)palette)->SetToolBitmapSize(wxSize(22, 22)); -#endif - palette->AddTool(PALETTE_ARROW, PaletteArrow, wxNullBitmap, TRUE, 0, -1, NULL, "Pointer"); palette->AddTool(PALETTE_TOOL1, PaletteTool1, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 1"); palette->AddTool(PALETTE_TOOL2, PaletteTool2, wxNullBitmap, TRUE, 0, -1, NULL, "Tool 2"); diff --git a/utils/ogl/samples/studio/shapes.cpp b/utils/ogl/samples/studio/shapes.cpp index b9197af2eb..ddae9bf453 100644 --- a/utils/ogl/samples/studio/shapes.cpp +++ b/utils/ogl/samples/studio/shapes.cpp @@ -1183,3 +1183,12 @@ void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event) } } +BEGIN_EVENT_TABLE(ShapeEditMenu, wxMenu) + EVT_COMMAND_RANGE(1, 65000, wxEVT_COMMAND_MENU_SELECTED, ShapeEditMenu::OnCommand) +END_EVENT_TABLE() + +void ShapeEditMenu::OnCommand(wxCommandEvent& event) +{ + studioShapeEditProc(*this, event); +} + diff --git a/utils/ogl/samples/studio/shapes.h b/utils/ogl/samples/studio/shapes.h index d817526793..2cb0272386 100644 --- a/utils/ogl/samples/studio/shapes.h +++ b/utils/ogl/samples/studio/shapes.h @@ -252,6 +252,16 @@ public: wxString m_label; }; +class ShapeEditMenu: public wxMenu +{ +public: + ShapeEditMenu() {} + + void OnCommand(wxCommandEvent& event); + +DECLARE_EVENT_TABLE() +}; + extern void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event); #endif diff --git a/utils/ogl/samples/studio/studio.cpp b/utils/ogl/samples/studio/studio.cpp index 576070cb52..01572c1e38 100644 --- a/utils/ogl/samples/studio/studio.cpp +++ b/utils/ogl/samples/studio/studio.cpp @@ -167,7 +167,7 @@ bool csApp::OnInit(void) FillProjectTreeCtrl(); // Create the shape editing menu - m_shapeEditMenu = new wxMenu("", (wxFunction)studioShapeEditProc); + m_shapeEditMenu = new ShapeEditMenu; m_shapeEditMenu->Append(ID_CS_EDIT_PROPERTIES, "Edit properties"); m_shapeEditMenu->AppendSeparator(); m_shapeEditMenu->Append(ID_CS_ROTATE_CLOCKWISE, "Rotate clockwise"); -- 2.45.2