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

don't use GTK specific code in wxListCtrl when building wxUniv

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-01-26 00:23:02 +00:00
parent 1483041dab
commit f16ba4e6fa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/listctrl.cpp
View File

@@ -50,7 +50,7 @@
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/listctrl.h" #include "wx/listctrl.h"
#ifdef __WXGTK__ #if defined(__WXGTK__)
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
#endif #endif
@@ -1796,7 +1796,7 @@ wxListHeaderWindow::~wxListHeaderWindow()
void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h ) void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
{ {
#ifdef __WXGTK__ #if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL GtkStateType state = m_parent->IsEnabled() ? GTK_STATE_NORMAL
: GTK_STATE_INSENSITIVE; : GTK_STATE_INSENSITIVE;
@@ -1866,7 +1866,7 @@ void wxListHeaderWindow::AdjustDC(wxDC& dc)
void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) ) void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{ {
#ifdef __WXGTK__ #if defined(__WXGTK__)
wxClientDC dc( this ); wxClientDC dc( this );
#else #else
wxPaintDC dc( this ); wxPaintDC dc( this );
@@ -1950,9 +1950,9 @@ void wxListHeaderWindow::DrawCurrent()
{ {
int x1 = m_currentX; int x1 = m_currentX;
int y1 = 0; int y1 = 0;
ClientToScreen( &x1, &y1 ); m_owner->ClientToScreen( &x1, &y1 );
int x2 = m_currentX-1; int x2 = m_currentX;
int y2 = 0; int y2 = 0;
m_owner->GetClientSize( NULL, &y2 ); m_owner->GetClientSize( NULL, &y2 );
m_owner->ClientToScreen( &x2, &y2 ); m_owner->ClientToScreen( &x2, &y2 );