projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxProgressDialog::Was{Cancelled,Skipped}() convenience methods.
[wxWidgets.git]
/
include
/
wx
/
xrc
/
xh_combo.h
diff --git
a/include/wx/xrc/xh_combo.h
b/include/wx/xrc/xh_combo.h
index 6be381c052e0426d6a20e2b117dca6e1fc0d046f..7f190fffe89c20907e1552a0a49c399a0ef8a193 100644
(file)
--- a/
include/wx/xrc/xh_combo.h
+++ b/
include/wx/xrc/xh_combo.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_combo.h
+// Name:
wx/xrc/
xh_combo.h
// Purpose: XML resource handler for wxComboBox
// Author: Bob Mitchell
// Created: 2000/03/21
// Purpose: XML resource handler for wxComboBox
// Author: Bob Mitchell
// Created: 2000/03/21
@@
-11,25
+11,24
@@
#ifndef _WX_XH_COMBO_H_
#define _WX_XH_COMBO_H_
#ifndef _WX_XH_COMBO_H_
#define _WX_XH_COMBO_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_combo.h"
-#endif
-
#include "wx/xrc/xmlres.h"
#include "wx/xrc/xmlres.h"
-#if wxUSE_COMBOBOX
+#if wxUSE_
XRC && wxUSE_
COMBOBOX
-class WX
XMLDLLEXPORT
wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WX
DLLIMPEXP_XRC
wxComboBoxXmlHandler : public wxXmlResourceHandler
{
{
+ DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
+
public:
wxComboBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
public:
wxComboBoxXmlHandler();
virtual wxObject *DoCreateResource();
virtual bool CanHandle(wxXmlNode *node);
+
private:
bool m_insideBox;
wxArrayString strList;
};
private:
bool m_insideBox;
wxArrayString strList;
};
-#endif
+#endif
// wxUSE_XRC && wxUSE_COMBOBOX
#endif // _WX_XH_COMBO_H_
#endif // _WX_XH_COMBO_H_