projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialized vars to something in wxToolBarBase.
[wxWidgets.git]
/
src
/
xrc
/
xh_radbt.cpp
diff --git
a/src/xrc/xh_radbt.cpp
b/src/xrc/xh_radbt.cpp
index 9caa453e627f59730189f05cc488cb366ebedb40..a4a07a74ed0449ca9bcd0f9fd428ca1b3e824430 100644
(file)
--- a/
src/xrc/xh_radbt.cpp
+++ b/
src/xrc/xh_radbt.cpp
@@
-1,14
+1,14
@@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_radbt.cpp
/////////////////////////////////////////////////////////////////////////////
// Name: xh_radbt.cpp
-// Purpose: X
ML
resource for wxRadioButton
+// Purpose: X
RC
resource for wxRadioButton
// Author: Bob Mitchell
// Created: 2000/03/21
// RCS-ID: $Id$
// Copyright: (c) 2000 Bob Mitchell and Verant Interactive
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Author: Bob Mitchell
// Created: 2000/03/21
// RCS-ID: $Id$
// Copyright: (c) 2000 Bob Mitchell and Verant Interactive
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if
def __GNUG__
+
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "xh_radbt.h"
#endif
#pragma implementation "xh_radbt.h"
#endif
@@
-19,48
+19,49
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_XRC && wxUSE_RADIOBTN
+
#include "wx/xrc/xh_radbt.h"
#include "wx/radiobut.h"
#include "wx/xrc/xh_radbt.h"
#include "wx/radiobut.h"
-#if wxUSE_RADIOBOX
+IMPLEMENT_DYNAMIC_CLASS(wxRadioButtonXmlHandler, wxXmlResourceHandler)
-wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
-: wxXmlResourceHandler()
+wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
+: wxXmlResourceHandler()
{
{
- ADD_STYLE( wxRB_GROUP );
+ XRC_ADD_STYLE(wxRB_GROUP);
+ XRC_ADD_STYLE(wxRB_SINGLE);
AddWindowStyles();
}
wxObject *wxRadioButtonXmlHandler::DoCreateResource()
AddWindowStyles();
}
wxObject *wxRadioButtonXmlHandler::DoCreateResource()
-{
+{
/* BOBM - implementation note.
* once the wxBitmapRadioButton is implemented.
/* BOBM - implementation note.
* once the wxBitmapRadioButton is implemented.
- * look for a bitmap property. If not null,
- * make it a wxBitmapRadioButton instead of the
+ * look for a bitmap property. If not null,
+ * make it a wxBitmapRadioButton instead of the
* normal radio button.
* normal radio button.
- */
+ */
- wxRadioButton *control = new wxRadioButton(m_parentAsWindow,
- GetID(),
- GetText(wxT("label")),
- GetPosition(), GetSize(),
- GetStyle(),
- wxDefaultValidator,
- GetName()
- );
+ XRC_MAKE_INSTANCE(control, wxRadioButton)
- control->SetValue( GetBool(wxT("value"), 0));
+ control->Create(m_parentAsWindow,
+ GetID(),
+ GetText(wxT("label")),
+ GetPosition(), GetSize(),
+ GetStyle(),
+ wxDefaultValidator,
+ GetName());
+
+ control->SetValue(GetBool(wxT("value"), 0));
SetupWindow(control);
SetupWindow(control);
-
+
return control;
}
return control;
}
-
-
bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxRadioButton"));
}
bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxRadioButton"));
}
-
-#endif
+#endif // wxUSE_XRC && wxUSE_RADIOBTN