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

Added XRC handler for wxPropertySheetDialog (Sander Berents)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-13 12:05:18 +00:00
parent 61ec769dfb
commit 49ab1eb964
7 changed files with 209 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/files.bkl
View File

@@ -2975,6 +2975,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/xrc/xh_notbk.cpp
src/xrc/xh_odcombo.cpp
src/xrc/xh_panel.cpp
src/xrc/xh_propdlg.cpp
src/xrc/xh_radbt.cpp
src/xrc/xh_radbx.cpp
<!-- disabled until linking problems are fixed -->
@@ -3035,6 +3036,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xrc/xh_notbk.h
wx/xrc/xh_odcombo.h
wx/xrc/xh_panel.h
wx/xrc/xh_propdlg.h
wx/xrc/xh_radbt.h
wx/xrc/xh_radbx.h
<!-- wx/xrc/xh_richtext.h -->

16
build/msw/makefile.vc
View File

@@ -1051,6 +1051,7 @@ XRCDLL_OBJECTS = \
$(OBJS)\xrcdll_xh_notbk.obj \
$(OBJS)\xrcdll_xh_odcombo.obj \
$(OBJS)\xrcdll_xh_panel.obj \
$(OBJS)\xrcdll_xh_propdlg.obj \
$(OBJS)\xrcdll_xh_radbt.obj \
$(OBJS)\xrcdll_xh_radbx.obj \
$(OBJS)\xrcdll_xh_scrol.obj \
@@ -1118,6 +1119,7 @@ XRCLIB_OBJECTS = \
$(OBJS)\xrclib_xh_notbk.obj \
$(OBJS)\xrclib_xh_odcombo.obj \
$(OBJS)\xrclib_xh_panel.obj \
$(OBJS)\xrclib_xh_propdlg.obj \
$(OBJS)\xrclib_xh_radbt.obj \
$(OBJS)\xrclib_xh_radbx.obj \
$(OBJS)\xrclib_xh_scrol.obj \
@@ -1442,6 +1444,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_xh_notbk.obj \
$(OBJS)\monodll_xh_odcombo.obj \
$(OBJS)\monodll_xh_panel.obj \
$(OBJS)\monodll_xh_propdlg.obj \
$(OBJS)\monodll_xh_radbt.obj \
$(OBJS)\monodll_xh_radbx.obj \
$(OBJS)\monodll_xh_scrol.obj \
@@ -2064,6 +2067,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_xh_notbk.obj \
$(OBJS)\monolib_xh_odcombo.obj \
$(OBJS)\monolib_xh_panel.obj \
$(OBJS)\monolib_xh_propdlg.obj \
$(OBJS)\monolib_xh_radbt.obj \
$(OBJS)\monolib_xh_radbx.obj \
$(OBJS)\monolib_xh_scrol.obj \
@@ -5503,6 +5507,9 @@ $(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7500,6 +7507,9 @@ $(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -12560,6 +12570,9 @@ $(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $**
@@ -12728,6 +12741,9 @@ $(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp
$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**
$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp
$(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $**

1
docs/changes.txt
View File

@@ -107,6 +107,7 @@ All (GUI):
of bitmap to fit page height.
- Fixed wxXPMHandler::SaveFile for images with more than 92 colors.
- Fixed a crash in wxGrid on creation due to OnSize being called too soon.
- Added XRC handler for wxPropertySheetDialog (Sander Berents).
wxMSW:

3
include/wx/xrc/xh_all.h
View File

@@ -67,5 +67,8 @@
#include "wx/xrc/xh_bmpcbox.h"
#include "wx/xrc/xh_animatctrl.h"
#include "wx/xrc/xh_collpane.h"
#if wxABI_VERSION >= 20805
#include "wx/xrc/xh_propdlg.h"
#endif
#endif // _WX_XH_ALL_H_

36
include/wx/xrc/xh_propdlg.h Normal file
View File

@@ -0,0 +1,36 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/xrc/xh_propdlg.h
// Purpose: XML resource handler for wxPropertySheetDialog
// Author: Sander Berents
// Created: 2007/07/12
// RCS-ID: $Id$
// Copyright: (c) 2007 Sander Berents
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_XH_PROPDLG_H_
#define _WX_XH_PROPDLG_H_
#include "wx/xrc/xmlres.h"
#if wxUSE_XRC
class WXDLLEXPORT wxPropertySheetDialog;
class WXDLLIMPEXP_XRC wxPropertySheetDialogXmlHandler : public wxXmlResourceHandler
{
DECLARE_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler)
public:
wxPropertySheetDialogXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
private:
bool m_isInside;
wxPropertySheetDialog *m_dialog;
};
#endif // wxUSE_XRC
#endif // _WX_XH_PROPDLG_H_

148
src/xrc/xh_propdlg.cpp Normal file
View File

@@ -0,0 +1,148 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/xrc/xh_propdlg.cpp
// Purpose: XRC resource handler for wxPropertySheetDialog
// Author: Sander Berents
// Created: 2007/07/12
// RCS-ID: $Id$
// Copyright: (c) 2007 Sander Berents
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_XRC && wxUSE_BOOKCTRL
#include "wx/xrc/xh_propdlg.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/sizer.h"
#endif
#include "wx/bookctrl.h"
#include "wx/propdlg.h"
IMPLEMENT_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler, wxXmlResourceHandler)
wxPropertySheetDialogXmlHandler::wxPropertySheetDialogXmlHandler()
:wxXmlResourceHandler(),
m_isInside(false),
m_dialog(NULL)
{
XRC_ADD_STYLE(wxSTAY_ON_TOP);
XRC_ADD_STYLE(wxCAPTION);
XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
XRC_ADD_STYLE(wxSYSTEM_MENU);
XRC_ADD_STYLE(wxRESIZE_BORDER);
XRC_ADD_STYLE(wxCLOSE_BOX);
XRC_ADD_STYLE(wxDIALOG_NO_PARENT);
XRC_ADD_STYLE(wxTAB_TRAVERSAL);
XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
XRC_ADD_STYLE(wxDIALOG_EX_METAL);
XRC_ADD_STYLE(wxMAXIMIZE_BOX);
XRC_ADD_STYLE(wxMINIMIZE_BOX);
XRC_ADD_STYLE(wxFRAME_SHAPED);
XRC_ADD_STYLE(wxDIALOG_EX_CONTEXTHELP);
AddWindowStyles();
}
wxObject *wxPropertySheetDialogXmlHandler::DoCreateResource()
{
if (m_class == wxT("propertysheetpage"))
{
wxXmlNode *n = GetParamNode(wxT("object"));
if (!n) n = GetParamNode(wxT("object_ref"));
if (n)
{
wxBookCtrlBase *bookctrl = m_dialog->GetBookCtrl();
bool old_ins = m_isInside;
m_isInside = false;
wxObject *item = CreateResFromNode(n, bookctrl, NULL);
m_isInside = old_ins;
wxWindow *wnd = wxDynamicCast(item, wxWindow);
if (wnd)
{
bookctrl->AddPage(wnd, GetText(wxT("label")), GetBool(wxT("selected")));
if (HasParam(wxT("bitmap")))
{
wxBitmap bmp = GetBitmap(wxT("bitmap"), wxART_OTHER);
wxImageList *imgList = bookctrl->GetImageList();
if (imgList == NULL)
{
imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight());
bookctrl->AssignImageList(imgList);
}
int imgIndex = imgList->Add(bmp);
bookctrl->SetPageImage(bookctrl->GetPageCount()-1, imgIndex);
}
}
else
wxLogError(wxT("Error in resource."));
return wnd;
}
else
{
wxLogError(wxT("Error in resource: no control within wxPropertySheetDialog's <page> tag."));
return NULL;
}
}
else
{
XRC_MAKE_INSTANCE(dlg, wxPropertySheetDialog)
dlg->Create(m_parentAsWindow,
GetID(),
GetText(wxT("title")),
GetPosition(),
GetSize(),
GetStyle(),
GetName());
if (HasParam(wxT("icon"))) dlg->SetIcon(GetIcon(wxT("icon"), wxART_FRAME_ICON));
SetupWindow(dlg);
wxPropertySheetDialog *old_par = m_dialog;
m_dialog = dlg;
bool old_ins = m_isInside;
m_isInside = true;
CreateChildren(m_dialog, true/*only this handler*/);
m_isInside = old_ins;
m_dialog = old_par;
if (GetBool(wxT("centered"), false)) dlg->Centre();
wxString buttons = GetText(wxT("buttons"));
if (!buttons.IsEmpty())
{
int flags = 0;
if (buttons.Find(wxT("wxOK")) != wxNOT_FOUND) flags |= wxOK;
if (buttons.Find(wxT("wxCANCEL")) != wxNOT_FOUND) flags |= wxCANCEL;
if (buttons.Find(wxT("wxYES")) != wxNOT_FOUND) flags |= wxYES;
if (buttons.Find(wxT("wxNO")) != wxNOT_FOUND) flags |= wxNO;
if (buttons.Find(wxT("wxHELP")) != wxNOT_FOUND) flags |= wxHELP;
if (buttons.Find(wxT("wxNO_DEFAULT")) != wxNOT_FOUND) flags |= wxNO_DEFAULT;
dlg->CreateButtons(flags);
}
return dlg;
}
}
bool wxPropertySheetDialogXmlHandler::CanHandle(wxXmlNode *node)
{
return ((!m_isInside && IsOfClass(node, wxT("wxPropertySheetDialog"))) ||
(m_isInside && IsOfClass(node, wxT("propertysheetpage"))));
}
#endif // wxUSE_XRC && wxUSE_BOOKCTRL

3
src/xrc/xmlrsall.cpp
View File

@@ -44,6 +44,9 @@ void wxXmlResource::InitAllHandlers()
#if wxUSE_BMPBUTTON
AddHandler(new wxBitmapButtonXmlHandler);
#endif
#if wxUSE_BOOKCTRL
AddHandler(new wxPropertySheetDialogXmlHandler);
#endif
#if wxUSE_BUTTON
AddHandler(new wxStdDialogButtonSizerXmlHandler);
AddHandler(new wxButtonXmlHandler);