Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18369/wxLua/modules/wxbind/src
Modified Files:
datetime.cpp gdi.cpp windows.cpp
Log Message:
Fix extra #endif statements from %member tags
Index: windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** windows.cpp 26 Jun 2007 03:22:07 -0000 1.69
--- windows.cpp 27 Jun 2007 14:29:54 -0000 1.70
***************
*** 265,272 ****
#if wxLUA_USE_wxFont
- { "font", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxVisualAttributes_GetFont, 1, NULL },
- #elif 1
{ "font", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxVisualAttributes_SetFont, 1, NULL },
! #endif // 1
{ 0, 0, 0, 0 },
};
--- 265,272 ----
#if wxLUA_USE_wxFont
{ "font", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxVisualAttributes_SetFont, 1, NULL },
! { "font", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxVisualAttributes_GetFont, 1, NULL },
! #endif // wxLUA_USE_wxFont
!
{ 0, 0, 0, 0 },
};
Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** gdi.cpp 27 Jun 2007 03:11:29 -0000 1.80
--- gdi.cpp 27 Jun 2007 14:29:54 -0000 1.81
***************
*** 16071,16079 ****
#endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxRenderer)
-
#if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
-
#if (wxLUA_USE_wxFont) && (wxLUA_USE_wxRenderer)
#endif // (wxLUA_USE_wxFont) && (wxLUA_USE_wxRenderer)
--- 16071,16077 ----
***************
*** 16152,16157 ****
{ "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxHeaderButtonParams_delete, 1, NULL },
- { "m_arrowColour", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_arrowColour, 1, NULL },
{ "m_arrowColour", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_arrowColour, 1, NULL },
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
--- 16150,16156 ----
{ "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxHeaderButtonParams_delete, 1, NULL },
+ #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
+ { "m_arrowColour", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_arrowColour, 1, NULL },
{ "m_arrowColour", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_arrowColour, 1, NULL },
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
***************
*** 16159,16174 ****
{ "m_labelAlignment", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelAlignment, 1, NULL },
{ "m_labelAlignment", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelAlignment, 1, NULL },
- { "m_labelBitmap", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelBitmap, 1, NULL },
{ "m_labelBitmap", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelBitmap, 1, NULL },
#endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxRenderer)
{ "m_labelColour", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelColour, 1, NULL },
-
{ "m_labelColour", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelColour, 1, NULL },
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
{ "m_labelFont", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelFont, 1, NULL },
-
{ "m_labelFont", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelFont, 1, NULL },
#endif // (wxLUA_USE_wxFont) && (wxLUA_USE_wxRenderer)
--- 16158,16174 ----
{ "m_labelAlignment", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelAlignment, 1, NULL },
{ "m_labelAlignment", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelAlignment, 1, NULL },
+ #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxRenderer)
+ { "m_labelBitmap", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelBitmap, 1, NULL },
{ "m_labelBitmap", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelBitmap, 1, NULL },
#endif // (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxRenderer)
+ #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
{ "m_labelColour", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelColour, 1, NULL },
{ "m_labelColour", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelColour, 1, NULL },
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
+ #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxRenderer)
{ "m_labelFont", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelFont, 1, NULL },
{ "m_labelFont", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelFont, 1, NULL },
#endif // (wxLUA_USE_wxFont) && (wxLUA_USE_wxRenderer)
***************
*** 16176,16181 ****
{ "m_labelText", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelText, 1, NULL },
{ "m_labelText", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelText, 1, NULL },
- { "m_selectionColour", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_selectionColour, 1, NULL },
{ "m_selectionColour", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_selectionColour, 1, NULL },
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
--- 16176,16182 ----
{ "m_labelText", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_labelText, 1, NULL },
{ "m_labelText", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_labelText, 1, NULL },
+ #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
+ { "m_selectionColour", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Set_m_selectionColour, 1, NULL },
{ "m_selectionColour", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxHeaderButtonParams_Get_m_selectionColour, 1, NULL },
#endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxRenderer)
Index: datetime.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** datetime.cpp 27 Jun 2007 03:11:28 -0000 1.53
--- datetime.cpp 27 Jun 2007 14:29:54 -0000 1.54
***************
*** 5333,5339 ****
- #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)
- #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)
-
#if ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
#endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
--- 5333,5336 ----
***************
*** 5461,5469 ****
{ "Language", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Get_Language, 1, NULL },
! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)
{ "LayoutDirection", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Set_LayoutDirection, 1, NULL },
- #elif ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
{ "LayoutDirection", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Get_LayoutDirection, 1, NULL },
#endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
{ "Set_CanonicalName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_CanonicalName, 1, NULL },
{ "Set_Description", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_Description, 1, NULL },
--- 5458,5466 ----
{ "Language", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Get_Language, 1, NULL },
! #if ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
{ "LayoutDirection", WXLUAMETHOD_SETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Set_LayoutDirection, 1, NULL },
{ "LayoutDirection", WXLUAMETHOD_GETPROP, s_wxluafunc_wxLua_wxLanguageInfo_Get_LayoutDirection, 1, NULL },
#endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL))
+
{ "Set_CanonicalName", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_CanonicalName, 1, NULL },
{ "Set_Description", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLanguageInfo_Set_Description, 1, NULL },
|
