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

Misc fixes, now menus are almost working on MicroWindows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-07-05 13:35:53 +00:00
parent 24b9f05515
commit 54800df8d8
13 changed files with 77 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/univ/themes/win32.cpp
View File

@@ -2410,7 +2410,6 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc,
DrawLine(dc, x2, y1, x2, y2, orient == wxVERTICAL);
}
#if wxUSE_MENUS
// ----------------------------------------------------------------------------
// menu and menubar
// ----------------------------------------------------------------------------
@@ -2445,7 +2444,7 @@ private:
GetMenuGeometry(wxWindow *, const wxMenu&) const;
};
#endif // wxUSE_WAVE
#endif // wxUSE_MENUS
// FIXME: all constants are hardcoded but shouldn't be
static const wxCoord MENU_LEFT_MARGIN = 9;
@@ -2680,9 +2679,6 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
return gi;
}
<<<<<<< win32.cpp
#endif
=======
#else // !wxUSE_MENUS
@@ -2725,7 +2721,6 @@ wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
#endif // wxUSE_MENUS/!wxUSE_MENUS
>>>>>>> 1.5
// ----------------------------------------------------------------------------
// combobox
// ----------------------------------------------------------------------------