d97c055514
Previously, TLW geometry was implicitly defined as just its position, size and the maximized/iconized state by wxPersistentTLW code. This already wasn't enough for wxGTK which added the decoration sizes to the geometry being saved/restored, but this had to be done using conditional compilation, which was not ideal. And it didn't allow using an entirely different geometry representation as will be done for wxMSW soon. Change the code to use wxTLWGeometry class defining the geometry, as used by the current port, explicitly and move wxPersistentTLW logic into it, as wxPersistentXXX classes are supposed to be very simple, which wasn't really the case. Also provide public SaveGeometry() and RestoreToGeometry() methods in wxTopLevelWindow, which can be useful even to people not using wxPersistentTLW for whatever reason. There should be no changes in behaviour so far.
74 lines
2.3 KiB
C++
74 lines
2.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/persist/toplevel.h
|
|
// Purpose: persistence support for wxTLW
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2009-01-19
|
|
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PERSIST_TOPLEVEL_H_
|
|
#define _WX_PERSIST_TOPLEVEL_H_
|
|
|
|
#include "wx/persist/window.h"
|
|
|
|
#include "wx/toplevel.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// string constants used by wxPersistentTLW
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// we use just "Window" to keep configuration files and such short, there
|
|
// should be no confusion with wxWindow itself as we don't have persistent
|
|
// windows, just persistent controls which have their own specific kind strings
|
|
#define wxPERSIST_TLW_KIND "Window"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPersistentTLW: supports saving/restoring window position and size as well
|
|
// as maximized/iconized/restore state
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class wxPersistentTLW : public wxPersistentWindow<wxTopLevelWindow>,
|
|
private wxTopLevelWindow::GeometrySerializer
|
|
{
|
|
public:
|
|
wxPersistentTLW(wxTopLevelWindow *tlw)
|
|
: wxPersistentWindow<wxTopLevelWindow>(tlw)
|
|
{
|
|
}
|
|
|
|
virtual void Save() const wxOVERRIDE
|
|
{
|
|
const wxTopLevelWindow * const tlw = Get();
|
|
|
|
tlw->SaveGeometry(*this);
|
|
}
|
|
|
|
virtual bool Restore() wxOVERRIDE
|
|
{
|
|
wxTopLevelWindow * const tlw = Get();
|
|
|
|
return tlw->RestoreToGeometry(*this);
|
|
}
|
|
|
|
virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_TLW_KIND; }
|
|
|
|
private:
|
|
virtual bool SaveField(const wxString& name, int value) const wxOVERRIDE
|
|
{
|
|
return SaveValue(name, value);
|
|
}
|
|
|
|
virtual bool RestoreField(const wxString& name, int* value) wxOVERRIDE
|
|
{
|
|
return RestoreValue(name, value);
|
|
}
|
|
};
|
|
|
|
inline wxPersistentObject *wxCreatePersistentObject(wxTopLevelWindow *tlw)
|
|
{
|
|
return new wxPersistentTLW(tlw);
|
|
}
|
|
|
|
#endif // _WX_PERSIST_TOPLEVEL_H_
|