Removed ::UpdateWindow from scrolwin.cpp; corrected default extension appending;
corrected bug in dcprint.cpp that tried to access deleted memory git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -325,6 +325,7 @@ $(CFG): makefile.b32
|
|||||||
-H=$(WXDIR)\src\msw\wx32.csm
|
-H=$(WXDIR)\src\msw\wx32.csm
|
||||||
-3
|
-3
|
||||||
-d
|
-d
|
||||||
|
-a1 # byte alignment
|
||||||
-R-
|
-R-
|
||||||
-X
|
-X
|
||||||
-w-par
|
-w-par
|
||||||
|
@@ -326,6 +326,28 @@ WORKAROUND: Change the declaration to void * or long
|
|||||||
visitor_email_address: rjl@zk3.dec.com
|
visitor_email_address: rjl@zk3.dec.com
|
||||||
wxWINDOWS+VERSION: 2.1.10
|
wxWINDOWS+VERSION: 2.1.10
|
||||||
|
|
||||||
|
DATE+FIXED: 12/01/2000
|
||||||
|
DATE+IDENTIFIED: 12/01/2000
|
||||||
|
DETAILS: When I try to Print or create
|
||||||
|
wxPrintPreview object in the
|
||||||
|
printing sample, it fails.
|
||||||
|
The reason is the wxGetDefaultDeviceName
|
||||||
|
function in file msw/dcprint.cpp. In line 253
|
||||||
|
the memory is freed, and then
|
||||||
|
the pointer to the freed memory
|
||||||
|
is used.
|
||||||
|
FIXED+BY: Alexey V. Exarevsky (patched into wxWin 12/1/2000 by JACS)
|
||||||
|
IDENTIFIED+BY: Alexey V. Exarevsky
|
||||||
|
PLATFORMS: wxMSW, compiled by VC++ 6.0
|
||||||
|
SHORT+DESCRIPTION: Print/Print preveiw to default printer in NT
|
||||||
|
Submit: Submit
|
||||||
|
WORKAROUND: I have moved lines that free
|
||||||
|
memory below the lines that
|
||||||
|
use lpszDeviceName and
|
||||||
|
lpszPortName
|
||||||
|
visitor_email_address: ave@relex.ru
|
||||||
|
wxWINDOWS+VERSION: 2.1.11
|
||||||
|
|
||||||
|
|
||||||
---------------------------END OF BUGLIST-------------------------
|
---------------------------END OF BUGLIST-------------------------
|
||||||
|
|
||||||
|
@@ -157,8 +157,8 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
|
|||||||
m_targetWindow->Refresh();
|
m_targetWindow->Refresh();
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
// Necessary?
|
// Necessary?
|
||||||
UpdateWindow ((HWND) m_targetWindow->GetHWND());
|
// UpdateWindow ((HWND) m_targetWindow->GetHWND());
|
||||||
#endif
|
#endif
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
m_targetWindow->MacUpdateImmediately() ;
|
m_targetWindow->MacUpdateImmediately() ;
|
||||||
|
@@ -247,12 +247,13 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
|
|||||||
lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset;
|
lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset;
|
||||||
lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
|
lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
|
||||||
lpszPortName = (LPSTR)lpDevNames + lpDevNames->wOutputOffset;
|
lpszPortName = (LPSTR)lpDevNames + lpDevNames->wOutputOffset;
|
||||||
GlobalUnlock(pd.hDevNames);
|
|
||||||
GlobalFree(pd.hDevNames);
|
|
||||||
pd.hDevNames=NULL;
|
|
||||||
|
|
||||||
deviceName = lpszDeviceName;
|
deviceName = lpszDeviceName;
|
||||||
portName = lpszPortName;
|
portName = lpszPortName;
|
||||||
|
|
||||||
|
GlobalUnlock(pd.hDevNames);
|
||||||
|
GlobalFree(pd.hDevNames);
|
||||||
|
pd.hDevNames=NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pd.hDevMode)
|
if (pd.hDevMode)
|
||||||
|
@@ -356,7 +356,7 @@ int wxFileDialog::ShowModal()
|
|||||||
|
|
||||||
m_filterIndex = (int)of.nFilterIndex - 1;
|
m_filterIndex = (int)of.nFilterIndex - 1;
|
||||||
|
|
||||||
if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.') )
|
if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.')) )
|
||||||
{ // user has typed an filename
|
{ // user has typed an filename
|
||||||
// without an extension:
|
// without an extension:
|
||||||
|
|
||||||
|
@@ -913,6 +913,7 @@ $(CFG): makefile.b32
|
|||||||
-H=$(WXDIR)\src\msw\wx32.csm
|
-H=$(WXDIR)\src\msw\wx32.csm
|
||||||
-3
|
-3
|
||||||
-d
|
-d
|
||||||
|
-a1 # byte alignment
|
||||||
-R-
|
-R-
|
||||||
-X
|
-X
|
||||||
-w-par
|
-w-par
|
||||||
|
Reference in New Issue
Block a user