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

Some changes in a vain attempt to make Salford C++ work; added FAQ files;

Browse Source 
started wxTime documentation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-19 11:00:22 +00:00
parent 15d5ab6757
commit ce3ed50dbe
82 changed files with 951 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/frame.cpp
View File

@@ -648,7 +648,7 @@ bool wxFrame::MSWOnPaint(void)
HDC cdc = BeginPaint((HWND) GetHWND(), &ps);
// Erase background before painting or we get white background
this->MSWDefWindowProc(WM_ICONERASEBKGND,(WORD)ps.hdc,0L);
this->MSWDefWindowProc(WM_ICONERASEBKGND,(WORD)(LONG) ps.hdc,0L);
if (the_icon)
{
@@ -894,9 +894,14 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
wxMenuBar *menuBar = GetMenuBar();
if (menuBar)
{
wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
// #ifndef __SALFORDC__
int menuId = event.GetMenuId();
wxString helpString;
// This causes a spurious access violation with Salford C++
helpString = menuBar->GetHelpString(menuId);
if (helpString != "")
SetStatusText(helpString);
SetStatusText(helpString);
// #endif
}
}
}