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:
51
include/wx/qt/toplevel.h
Normal file
51
include/wx/qt/toplevel.h
Normal file
@@ -0,0 +1,51 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/qt/toplevel.h
|
||||
// Purpose: declares wxTopLevelWindowNative class
|
||||
// Author: Peter Most, Javier Torres
|
||||
// Modified by:
|
||||
// Created: 09.08.09
|
||||
// Copyright: (c) Peter Most, Javier Torres
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_QT_TOPLEVEL_H_
|
||||
#define _WX_QT_TOPLEVEL_H_
|
||||
|
||||
class WXDLLIMPEXP_CORE wxTopLevelWindowQt : public wxTopLevelWindowBase
|
||||
{
|
||||
public:
|
||||
wxTopLevelWindowQt();
|
||||
wxTopLevelWindowQt(wxWindow *parent,
|
||||
wxWindowID winid,
|
||||
const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_FRAME_STYLE,
|
||||
const wxString& name = wxFrameNameStr);
|
||||
|
||||
virtual void Maximize(bool maximize = true);
|
||||
virtual void Restore();
|
||||
virtual void Iconize(bool iconize = true);
|
||||
virtual bool IsMaximized() const;
|
||||
virtual bool IsIconized() const;
|
||||
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
|
||||
virtual bool IsFullScreen() const;
|
||||
virtual void SetTitle(const wxString& title);
|
||||
virtual wxString GetTitle() const;
|
||||
virtual void SetIcons(const wxIconBundle& icons);
|
||||
|
||||
// Styles
|
||||
virtual void SetWindowStyleFlag( long style );
|
||||
virtual long GetWindowStyleFlag() const;
|
||||
};
|
||||
|
||||
#endif // _WX_QT_TOPLEVEL_H_
|
Reference in New Issue
Block a user