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:
46
src/qt/statline.cpp
Normal file
46
src/qt/statline.cpp
Normal file
@@ -0,0 +1,46 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: src/qt/statline.cpp
|
||||
// Author: Peter Most
|
||||
// Copyright: (c) Peter Most
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/statline.h"
|
||||
|
||||
wxStaticLine::wxStaticLine()
|
||||
{
|
||||
}
|
||||
|
||||
wxStaticLine::wxStaticLine( wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString &name)
|
||||
{
|
||||
Create( parent, id, pos, size, style, name );
|
||||
}
|
||||
|
||||
bool wxStaticLine::Create( wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxString &name)
|
||||
{
|
||||
m_qtFrame = new QFrame( parent->GetHandle() );
|
||||
if ( style & wxLI_HORIZONTAL )
|
||||
m_qtFrame->setFrameStyle( QFrame::HLine );
|
||||
else if ( style & wxLI_VERTICAL )
|
||||
m_qtFrame->setFrameStyle( QFrame::VLine );
|
||||
|
||||
return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name );
|
||||
}
|
||||
|
||||
QFrame *wxStaticLine::GetHandle() const
|
||||
{
|
||||
return m_qtFrame;
|
||||
}
|
Reference in New Issue
Block a user