From: John L. <jr...@us...> - 2007-03-09 00:15:48
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32506/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: update to 2.8 using C++ header files Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wxbind.h 7 Mar 2007 23:56:42 -0000 1.55 --- wxbind.h 9 Mar 2007 00:15:13 -0000 1.56 *************** *** 108,115 **** --- 108,123 ---- #endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #include "wx/event.h" + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) #include "wx/bmpbuttn.h" #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP) + #include "wx/cshelp.h" + #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP) + #if (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX) && (wxLUA_USE_wxListBox && wxUSE_LISTBOX) #include "wx/checklst.h" *************** *** 160,163 **** --- 168,172 ---- #include "wx/control.h" #include "wx/defs.h" + #include "wx/effects.h" #include "wx/event.h" #include "wx/filefn.h" *************** *** 175,178 **** --- 184,191 ---- #endif // wxCHECK_VERSION(2,4,0) && defined(__WXMSW__) && wxLUA_USE_wxTabCtrl && wxUSE_TAB_DIALOG + #if wxCHECK_VERSION(2,8,0) + #include "wx/event.h" + #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog #include "wx/aboutdlg.h" *************** *** 395,398 **** --- 408,412 ---- #if wxLUA_USE_wxHelpController && wxUSE_HELP + #include "wx/cshelp.h" #include "wx/help.h" #endif // wxLUA_USE_wxHelpController && wxUSE_HELP *************** *** 683,694 **** --- 697,720 ---- #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClipboardTextEvent; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAutoBufferedPaintDC; #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxURLDataObject; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapButton; #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxContextHelpButton; + #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP) + #if (wxLUA_USE_wxBrushList) && (wxLUA_USE_wxColourPenBrush) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBrushList; *************** *** 797,804 **** --- 823,833 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxActivateEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxChildFocusEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClientData; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCloseEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCommandEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxControl; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDisplayChangedEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxEffects; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxEraseEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxEvent; *************** *** 817,827 **** --- 846,860 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMoveEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNavigationKeyEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotifyEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaintEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaletteChangedEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPanel; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxQueryNewPaletteEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxScrollEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxScrollWinEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSetCursorEvent; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxShowEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizeEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxString; *************** *** 844,847 **** --- 877,884 ---- #endif // wxCHECK_VERSION(2,7,0) + #if wxCHECK_VERSION(2,8,0) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseCaptureLostEvent; + #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxAboutDialogInfo; *************** *** 895,898 **** --- 932,936 ---- #if wxLUA_USE_wxBusyCursor extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursor; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursorSuspender; #endif // wxLUA_USE_wxBusyCursor *************** *** 914,917 **** --- 952,956 ---- #if wxLUA_USE_wxCaret && wxUSE_CARET extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCaret; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCaretSuspend; #endif // wxLUA_USE_wxCaret && wxUSE_CARET *************** *** 956,959 **** --- 995,999 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfig; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfigBase; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxConfigPathChanger; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFileConfig; #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG *************** *** 1135,1139 **** --- 1175,1183 ---- #if wxLUA_USE_wxHelpController && wxUSE_HELP + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxContextHelp; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpController; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpControllerHelpProvider; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHelpProvider; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSimpleHelpProvider; #endif // wxLUA_USE_wxHelpController && wxUSE_HELP *************** *** 1537,1540 **** --- 1581,1589 ---- #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML && wxUSE_HTML) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxClipboardTextEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxClipboardTextEvent_methodCount; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxClipboard && wxUSE_CLIPBOARD) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAutoBufferedPaintDC_methods[]; *************** *** 1542,1545 **** --- 1591,1599 ---- #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDC) + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxURLDataObject_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxURLDataObject_methodCount; + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBitmapButton_methods[]; *************** *** 1547,1550 **** --- 1601,1609 ---- #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxButton && wxUSE_BUTTON) + #if (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP) + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxContextHelpButton_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxContextHelpButton_methodCount; + #endif // (wxLUA_USE_wxBitmapButton && wxUSE_BMPBUTTON) && (wxLUA_USE_wxHelpController && wxUSE_HELP) + #if (wxLUA_USE_wxBrushList) && (wxLUA_USE_wxColourPenBrush) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBrushList_methods[]; *************** *** 1684,1687 **** --- 1743,1748 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxActivateEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxActivateEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxChildFocusEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxChildFocusEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxClientData_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxClientData_methodCount; *************** *** 1692,1695 **** --- 1753,1760 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxControl_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxControl_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxDisplayChangedEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDisplayChangedEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxEffects_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxEffects_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxEraseEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxEraseEvent_methodCount; *************** *** 1724,1735 **** --- 1789,1806 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxMoveEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMoveEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxNavigationKeyEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxNavigationKeyEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxNotifyEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotifyEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPaintEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPaintEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPaletteChangedEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPaletteChangedEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxPanel_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPanel_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxProcessEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcessEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxQueryNewPaletteEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxQueryNewPaletteEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxScrollEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxScrollEvent_methodCount; *************** *** 1738,1741 **** --- 1809,1814 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSetCursorEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSetCursorEvent_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxShowEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxShowEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSizeEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizeEvent_methodCount; *************** *** 1771,1774 **** --- 1844,1852 ---- #endif // wxCHECK_VERSION(2,7,0) + #if wxCHECK_VERSION(2,8,0) + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxMouseCaptureLostEvent_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMouseCaptureLostEvent_methodCount; + #endif // wxCHECK_VERSION(2,8,0) + #if wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxAboutDialogInfo_methods[]; *************** *** 1845,1848 **** --- 1923,1928 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBusyCursor_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursor_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxBusyCursorSuspender_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursorSuspender_methodCount; #endif // wxLUA_USE_wxBusyCursor *************** *** 1871,1874 **** --- 1951,1956 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxCaret_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxCaret_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxCaretSuspend_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxCaretSuspend_methodCount; #endif // wxLUA_USE_wxCaret && wxUSE_CARET *************** *** 1928,1931 **** --- 2010,2015 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxConfigBase_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxConfigBase_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxConfigPathChanger_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxConfigPathChanger_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxFileConfig_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxFileConfig_methodCount; *************** *** 2196,2201 **** --- 2280,2293 ---- #if wxLUA_USE_wxHelpController && wxUSE_HELP + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxContextHelp_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxContextHelp_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHelpController_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpController_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHelpControllerHelpProvider_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpControllerHelpProvider_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxHelpProvider_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHelpProvider_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxSimpleHelpProvider_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSimpleHelpProvider_methodCount; #endif // wxLUA_USE_wxHelpController && wxUSE_HELP *************** *** 2699,2702 **** --- 2791,2798 ---- // --------------------------------------------------------------------------- + #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxURLDataObject, wxURLDataObject) + #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString, wxString) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler, wxWindowDisabler) *************** *** 2732,2735 **** --- 2828,2832 ---- #if wxLUA_USE_wxBusyCursor wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor, wxBusyCursor) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursorSuspender, wxBusyCursorSuspender) #endif // wxLUA_USE_wxBusyCursor *************** *** 2738,2745 **** --- 2835,2850 ---- #endif // wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL + #if wxLUA_USE_wxCaret && wxUSE_CARET + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCaretSuspend, wxCaretSuspend) + #endif // wxLUA_USE_wxCaret && wxUSE_CARET + #if wxLUA_USE_wxColourPenBrush wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxColourDatabase, wxColourDatabase) #endif // wxLUA_USE_wxColourPenBrush + #if wxLUA_USE_wxConfig && wxUSE_CONFIG + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxConfigPathChanger, wxConfigPathChanger) + #endif // wxLUA_USE_wxConfig && wxUSE_CONFIG + #if wxLUA_USE_wxCriticalSection && wxUSE_THREADS wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCriticalSection, wxCriticalSection) *************** *** 2807,2810 **** --- 2912,2921 ---- #endif // wxLUA_USE_wxGrid && wxUSE_GRID + #if wxLUA_USE_wxHelpController && wxUSE_HELP + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpControllerHelpProvider, wxHelpControllerHelpProvider) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHelpProvider, wxHelpProvider) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSimpleHelpProvider, wxSimpleHelpProvider) + #endif // wxLUA_USE_wxHelpController && wxUSE_HELP + #if wxLUA_USE_wxIcon wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxIconBundle, wxIconBundle) |