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

tons of fixes for wxGTK/Univ - seems to work, more or less, now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-03 19:38:19 +00:00
parent 67d95e11cf
commit 3379ed3789
56 changed files with 1315 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1801,14 +1801,6 @@ void wxWin32Renderer::DoDrawLabel(wxDC& dc,
{
if ( focusOffset.x || focusOffset.y )
{
// before calling Inflate(), ensure that we will have a valid rect
// afterwards
if ( rectLabel.x < focusOffset.x )
rectLabel.x = focusOffset.x;
if ( rectLabel.y < focusOffset.y )
rectLabel.y = focusOffset.y;
rectLabel.Inflate(focusOffset.x, focusOffset.y);
}
@@ -2419,6 +2411,8 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc,
// menu and menubar
// ----------------------------------------------------------------------------
#if wxUSE_MENUS
// wxWin32MenuGeometryInfo: the wxMenuGeometryInfo used by wxWin32Renderer
class WXDLLEXPORT wxWin32MenuGeometryInfo : public wxMenuGeometryInfo
{
@@ -2447,6 +2441,8 @@ private:
GetMenuGeometry(wxWindow *, const wxMenu&) const;
};
#endif // wxUSE_WAVE
// FIXME: all constants are hardcoded but shouldn't be
static const wxCoord MENU_LEFT_MARGIN = 9;
static const wxCoord MENU_RIGHT_MARGIN = 18;
@@ -2466,6 +2462,10 @@ static const wxCoord MENU_SEPARATOR_HEIGHT = 3;
// the size of the standard checkmark bitmap
static const wxCoord MENU_CHECK_SIZE = 9;
// we can't implement these methods without wxMenuGeometryInfo implementation
// which we don't have if !wxUSE_MENUS
#if wxUSE_MENUS
void wxWin32Renderer::DrawMenuBarItem(wxDC& dc,
const wxRect& rectOrig,
const wxString& label,
@@ -2677,6 +2677,47 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
return gi;
}
#else // !wxUSE_MENUS
void wxWin32Renderer::DrawMenuBarItem(wxDC& WXUNUSED(dc),
const wxRect& WXUNUSED(rectOrig),
const wxString& WXUNUSED(label),
int WXUNUSED(flags),
int WXUNUSED(indexAccel))
{
}
void wxWin32Renderer::DrawMenuItem(wxDC& WXUNUSED(dc),
wxCoord WXUNUSED(y),
const wxMenuGeometryInfo& WXUNUSED(gi),
const wxString& WXUNUSED(label),
const wxString& WXUNUSED(accel),
const wxBitmap& WXUNUSED(bitmap),
int WXUNUSED(flags),
int WXUNUSED(indexAccel))
{
}
void wxWin32Renderer::DrawMenuSeparator(wxDC& WXUNUSED(dc),
wxCoord WXUNUSED(y),
const wxMenuGeometryInfo& WXUNUSED(gi))
{
}
wxSize wxWin32Renderer::GetMenuBarItemSize(const wxSize& size) const
{
return size;
}
wxMenuGeometryInfo *
wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
const wxMenu& WXUNUSED(menu)) const
{
return NULL;
}
#endif // wxUSE_MENUS/!wxUSE_MENUS
// ----------------------------------------------------------------------------
// combobox
// ----------------------------------------------------------------------------
@@ -2880,11 +2921,6 @@ wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text,
wxRect rectTotal = rect;
wxCoord widthBorder = GetTextBorderWidth();
if ( rectTotal.x < widthBorder )
rectTotal.x = widthBorder;
if ( rectTotal.y < widthBorder )
rectTotal.y = widthBorder;
rectTotal.Inflate(widthBorder);
// this is what Windows does
@@ -2904,11 +2940,6 @@ wxRect wxWin32Renderer::GetTextClientArea(const wxTextCtrl *text,
rectText.height--;
wxCoord widthBorder = GetTextBorderWidth();
if ( rectText.width < 2*widthBorder )
rectText.width = 2*widthBorder;
if ( rectText.height < 2*widthBorder )
rectText.height = 2*widthBorder;
rectText.Inflate(-widthBorder);
if ( extraSpaceBeyond )