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

Removed most of the propgrid '#ifndef SWIG' pre-compiler conditions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-02-10 16:45:39 +00:00
parent a2837c3c43
commit ec3cce5a29
9 changed files with 25 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/wx/propgrid/propgriddefs.h
View File

@@ -28,8 +28,6 @@
// NOTE: More in propertygrid.cpp
//
#ifndef SWIG
#if defined(__WXMSW__)
// space between vertical line and value text
@@ -209,7 +207,6 @@
#define wxPG_SMALL_SCREEN 0
#endif
#endif // #ifndef SWIG
// Undefine wxPG_ICON_WIDTH to use supplied xpm bitmaps instead
// (for tree buttons)
@@ -264,17 +261,13 @@ class wxPGValidationInfo;
@{
*/
#ifndef SWIG
// Used to tell wxPGProperty to use label as name as well
#define wxPG_LABEL (*wxPGProperty::sm_wxPG_LABEL)
// This is the value placed in wxPGProperty::sm_wxPG_LABEL
#define wxPG_LABEL_STRING wxS("@!")
#define wxPG_NULL_BITMAP wxNullBitmap
#define wxPG_COLOUR_BLACK (*wxBLACK)
#else
#define wxPG_NULL_BITMAP wxBitmap_NULL
#define wxPG_COLOUR_BLACK wxColour_BLACK
#endif // #ifndef SWIG
// Used to tell wxPGProperty to use label as name as well
#define wxPG_LABEL (*wxPGProperty::sm_wxPG_LABEL)
// This is the value placed in wxPGProperty::sm_wxPG_LABEL
#define wxPG_LABEL_STRING wxS("@!")
#define wxPG_NULL_BITMAP wxNullBitmap
#define wxPG_COLOUR_BLACK (*wxBLACK)
/** Convert Red, Green and Blue to a single 32-bit value.
*/
@@ -323,13 +316,10 @@ typedef wxString wxPGCachedString;
// -----------------------------------------------------------------------
#ifndef SWIG
WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxPGProperty*, wxArrayPGProperty,
wxBaseArrayPtrVoid,
class WXDLLIMPEXP_PROPGRID);
// Always use wxString based hashmap with unicode, stl, swig and GCC 4.0+
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(void*,
wxPGHashMapS2P,
class WXDLLIMPEXP_PROPGRID);
@@ -349,8 +339,6 @@ WX_DECLARE_HASH_MAP_WITH_DECL(wxInt32,
wxPGHashMapI2I,
class WXDLLIMPEXP_PROPGRID);
#endif // #ifndef SWIG
// -----------------------------------------------------------------------
enum wxPG_GETPROPERTYVALUES_FLAGS
@@ -442,15 +430,17 @@ enum wxPG_SETVALUE_FLAGS
// -----------------------------------------------------------------------
// Editor class.
#ifndef SWIG
// Editor accessor (for backwards compatiblity use only).
#define wxPG_EDITOR(T) wxPGEditor_##T
// Declare editor class, with optional part.
#define WX_PG_DECLARE_EDITOR_WITH_DECL(EDITOR,DECL) \
extern DECL wxPGEditor* wxPGEditor_##EDITOR; \
extern DECL wxPGEditor* wxPGConstruct##EDITOR##EditorClass();
// Macro for declaring editor class, with optional impexpdecl part.
#ifndef WX_PG_DECLARE_EDITOR_WITH_DECL
#define WX_PG_DECLARE_EDITOR_WITH_DECL(EDITOR,DECL) \
extern DECL wxPGEditor* wxPGEditor_##EDITOR; \
extern DECL wxPGEditor* wxPGConstruct##EDITOR##EditorClass();
#endif
// Declare editor class.
#define WX_PG_DECLARE_EDITOR(EDITOR) \
@@ -467,8 +457,6 @@ WX_PG_DECLARE_EDITOR_WITH_DECL(CheckBox,WXDLLIMPEXP_PROPGRID)
#endif
WX_PG_DECLARE_EDITOR_WITH_DECL(ChoiceAndButton,WXDLLIMPEXP_PROPGRID)
#endif // !SWIG
// -----------------------------------------------------------------------
#ifndef SWIG
@@ -672,8 +660,6 @@ template<> inline wxVariant WXVARIANT( const wxColour& value )
// -----------------------------------------------------------------------
#ifndef SWIG
//
// Tokenizer macros.
// NOTE: I have made two versions - worse ones (performance and consistency
@@ -729,8 +715,6 @@ protected:
#define WX_PG_TOKENIZER2_END() \
}
#endif
// -----------------------------------------------------------------------
#endif // wxUSE_PROPGRID