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

Fixed compile error.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-09-17 22:08:35 +00:00
parent 059a841c96
commit cefd71d783
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/src/xrc/xh_unkwn.cpp
View File

@@ -7,7 +7,7 @@
// Copyright: (c) 2000 Vaclav Slavik // Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "xh_unkwn.h" #pragma implementation "xh_unkwn.h"
#endif #endif
@@ -23,6 +23,7 @@
#include "wx/window.h" #include "wx/window.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/panel.h"
class wxUnknownControlContainer : public wxPanel class wxUnknownControlContainer : public wxPanel
@@ -35,14 +36,14 @@ public:
const wxSize& size = wxDefaultSize) const wxSize& size = wxDefaultSize)
: wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER, : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
controlName + wxT("_container")), controlName + wxT("_container")),
m_controlName(controlName), m_controlAdded(FALSE) m_controlName(controlName), m_controlAdded(FALSE)
{ {
m_bg = GetBackgroundColour(); m_bg = GetBackgroundColour();
SetBackgroundColour(wxColour(255, 0, 255)); SetBackgroundColour(wxColour(255, 0, 255));
} }
virtual void AddChild(wxWindowBase *child); virtual void AddChild(wxWindowBase *child);
protected: protected:
wxString m_controlName; wxString m_controlName;
bool m_controlAdded; bool m_controlAdded;
@@ -54,12 +55,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") ) wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
wxPanel::AddChild(child); wxPanel::AddChild(child);
SetBackgroundColour(m_bg); SetBackgroundColour(m_bg);
child->SetName(m_controlName); child->SetName(m_controlName);
child->SetId(wxXmlResource::GetXMLID(m_controlName)); child->SetId(wxXmlResource::GetXMLID(m_controlName));
m_controlAdded = TRUE; m_controlAdded = TRUE;
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add((wxWindow*)child, 1, wxEXPAND); sizer->Add((wxWindow*)child, 1, wxEXPAND);
SetSizer(sizer); SetSizer(sizer);
@@ -69,14 +70,14 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler() wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
} }
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource() wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
{ {
wxPanel *panel = wxPanel *panel =
new wxUnknownControlContainer(m_parentAsWindow, new wxUnknownControlContainer(m_parentAsWindow,
GetName(), -1, GetName(), -1,
GetPosition(), GetSize()); GetPosition(), GetSize());

19
src/xrc/xh_unkwn.cpp
View File

@@ -7,7 +7,7 @@
// Copyright: (c) 2000 Vaclav Slavik // Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "xh_unkwn.h" #pragma implementation "xh_unkwn.h"
#endif #endif
@@ -23,6 +23,7 @@
#include "wx/window.h" #include "wx/window.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/panel.h"
class wxUnknownControlContainer : public wxPanel class wxUnknownControlContainer : public wxPanel
@@ -35,14 +36,14 @@ public:
const wxSize& size = wxDefaultSize) const wxSize& size = wxDefaultSize)
: wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER, : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
controlName + wxT("_container")), controlName + wxT("_container")),
m_controlName(controlName), m_controlAdded(FALSE) m_controlName(controlName), m_controlAdded(FALSE)
{ {
m_bg = GetBackgroundColour(); m_bg = GetBackgroundColour();
SetBackgroundColour(wxColour(255, 0, 255)); SetBackgroundColour(wxColour(255, 0, 255));
} }
virtual void AddChild(wxWindowBase *child); virtual void AddChild(wxWindowBase *child);
protected: protected:
wxString m_controlName; wxString m_controlName;
bool m_controlAdded; bool m_controlAdded;
@@ -54,12 +55,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") ) wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
wxPanel::AddChild(child); wxPanel::AddChild(child);
SetBackgroundColour(m_bg); SetBackgroundColour(m_bg);
child->SetName(m_controlName); child->SetName(m_controlName);
child->SetId(wxXmlResource::GetXMLID(m_controlName)); child->SetId(wxXmlResource::GetXMLID(m_controlName));
m_controlAdded = TRUE; m_controlAdded = TRUE;
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add((wxWindow*)child, 1, wxEXPAND); sizer->Add((wxWindow*)child, 1, wxEXPAND);
SetSizer(sizer); SetSizer(sizer);
@@ -69,14 +70,14 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler() wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
: wxXmlResourceHandler() : wxXmlResourceHandler()
{ {
} }
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource() wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
{ {
wxPanel *panel = wxPanel *panel =
new wxUnknownControlContainer(m_parentAsWindow, new wxUnknownControlContainer(m_parentAsWindow,
GetName(), -1, GetName(), -1,
GetPosition(), GetSize()); GetPosition(), GetSize());