Merge wxQT branch into the trunk.
This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
25
src/qt/colour.cpp
Normal file
25
src/qt/colour.cpp
Normal file
@@ -0,0 +1,25 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/qt/colour.h
|
||||
// Purpose: wxColour class implementation for wxQt
|
||||
// Author: Peter Most, Kolya Kosenko
|
||||
// Created: 2010-05-12
|
||||
// Copyright: (c) Peter Most
|
||||
// (C) 2010 Kolya Kosenko
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
#include "wx/qt/private/utils.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
int wxColour::GetPixel() const
|
||||
{
|
||||
wxMISSING_IMPLEMENTATION( "wxColour::GetPixel" );
|
||||
return 0;
|
||||
}
|
||||
|
||||
#include "wx/colour.h"
|
Reference in New Issue
Block a user