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

fix build, remove unused parameter from wxGetGdkWindowForDC()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-12-13 18:56:25 +00:00
parent 509675f86b
commit 7e71773004
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk/renderer.cpp
View File

@@ -134,7 +134,7 @@ wxRendererNative& wxRendererNative::GetDefault()
return s_rendererGTK; return s_rendererGTK;
} }
GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc) static GdkWindow* wxGetGdkWindowForDC(wxDC& dc)
{ {
GdkWindow* gdk_window = NULL; GdkWindow* gdk_window = NULL;
#if wxUSE_NEW_DC #if wxUSE_NEW_DC
@@ -163,7 +163,7 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget(); GtkWidget *button = wxGTKPrivate::GetHeaderButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -202,7 +202,7 @@ wxRendererGTK::DrawTreeItemButton(wxWindow* win,
{ {
GtkWidget *tree = wxGTKPrivate::GetTreeWidget(); GtkWidget *tree = wxGTKPrivate::GetTreeWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -281,7 +281,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
return; return;
} }
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -341,7 +341,7 @@ wxRendererGTK::DrawDropArrow(wxWindow *WXUNUSED(win),
// work for wxMemoryDC. So that is why we assume wxDC // work for wxMemoryDC. So that is why we assume wxDC
// is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC // is wxWindowDC (wxClientDC, wxMemoryDC and wxPaintDC
// are derived from it) and use its m_window. // are derived from it) and use its m_window.
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -416,7 +416,7 @@ wxRendererGTK::DrawCheckBox(wxWindow *WXUNUSED(win),
{ {
GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget(); GtkWidget *button = wxGTKPrivate::GetCheckButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -460,7 +460,7 @@ wxRendererGTK::DrawPushButton(wxWindow *WXUNUSED(win),
{ {
GtkWidget *button = wxGTKPrivate::GetButtonWidget(); GtkWidget *button = wxGTKPrivate::GetButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -498,7 +498,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
const wxRect& rect, const wxRect& rect,
int flags ) int flags )
{ {
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -552,7 +552,7 @@ wxRendererGTK::DrawItemSelectionRect(wxWindow *win,
void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
{ {
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
wxASSERT_MSG( gdk_window, wxASSERT_MSG( gdk_window,
wxT("cannot use wxRendererNative on wxDC of this type") ); wxT("cannot use wxRendererNative on wxDC of this type") );
@@ -575,11 +575,11 @@ void wxRendererGTK::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, i
} }
// Uses the theme to draw the border and fill for something like a wxTextCtrl // Uses the theme to draw the border and fill for something like a wxTextCtrl
void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawTextCtrl(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
{ {
GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget(); GtkWidget *entry = wxGTKPrivate::GetTextEntryWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
GtkStateType state = GTK_STATE_NORMAL; GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
@@ -607,11 +607,11 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
} }
// Draw the equivallent of a wxComboBox // Draw the equivallent of a wxComboBox
void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawComboBox(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
{ {
GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget(); GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
GtkStateType state = GTK_STATE_NORMAL; GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
@@ -690,11 +690,11 @@ void wxRendererGTK::DrawChoice(wxWindow* win, wxDC& dc,
// Draw a themed radio button // Draw a themed radio button
void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags) void wxRendererGTK::DrawRadioButton(wxWindow*, wxDC& dc, const wxRect& rect, int flags)
{ {
GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget(); GtkWidget *button = wxGTKPrivate::GetRadioButtonWidget();
GdkWindow* gdk_window = wxGetGdkWindowForDC(win, dc); GdkWindow* gdk_window = wxGetGdkWindowForDC(dc);
GtkShadowType shadow_type = GTK_SHADOW_OUT; GtkShadowType shadow_type = GTK_SHADOW_OUT;
if ( flags & wxCONTROL_CHECKED ) if ( flags & wxCONTROL_CHECKED )
@@ -704,9 +704,9 @@ void wxRendererGTK::DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect,
GtkStateType state = GTK_STATE_NORMAL; GtkStateType state = GTK_STATE_NORMAL;
if ( flags & wxCONTROL_DISABLED ) if ( flags & wxCONTROL_DISABLED )
state = GTK_STATE_INSENSITIVE; state = GTK_STATE_INSENSITIVE;
if ( flags & wxCONTROL_PRESSED ) if ( flags & wxCONTROL_PRESSED )
state = GTK_STATE_ACTIVE; state = GTK_STATE_ACTIVE;
/* /*
Don't know when to set this Don't know when to set this
state_type = GTK_STATE_PRELIGHT; state_type = GTK_STATE_PRELIGHT;