Index: trunk/wxLua/bindings/wxwidgets/wxcore_windows.i =================================================================== --- trunk/wxLua/bindings/wxwidgets/wxcore_windows.i (revision 98) +++ trunk/wxLua/bindings/wxwidgets/wxcore_windows.i (working copy) @@ -352,6 +352,40 @@ %endif //wxLUA_USE_wxWindowList && !wxUSE_STL // --------------------------------------------------------------------------- +// wxPopupWindow + +%if wxLUA_USE_wxPopupWindow + +%include "wx/popupwin.h" + +%class wxPopupWindow, wxWindow + wxPopupWindow(wxWindow* parent, int flags = wxBORDER_NONE) + bool Create(wxWindow* parent, int flags = wxBORDER_NONE) + virtual void Position(const wxPoint &ptOrigin, const wxSize &sizePopup) + +%endclass + +%endif // wxLUA_USE_wxPopupWindow + +// --------------------------------------------------------------------------- +// wxPopupTransientWindow + +%if wxLUA_USE_wxPopupTransientWindow + +%include "wx/popupwin.h" + +%class wxPopupTransientWindow, wxPopupWindow + wxPopupTransientWindow() + wxPopupTransientWindow(wxWindow *parent, int flags = wxBORDER_NONE) + virtual void Popup(wxWindow *focus = NULL) + virtual void Dismiss() + virtual void ProcessLeftDown(wxMouseEvent &event) + +%endclass + +%endif // wxLUA_USE_wxPopupTransientWindow + +// --------------------------------------------------------------------------- // wxPanel %class wxPanel, wxWindow Index: trunk/wxLua/modules/wxbind/setup/wxluasetup.h =================================================================== --- trunk/wxLua/modules/wxbind/setup/wxluasetup.h (revision 98) +++ trunk/wxLua/modules/wxbind/setup/wxluasetup.h (working copy) @@ -115,6 +115,8 @@ #define wxLUA_USE_wxPalette 1 #define wxLUA_USE_wxPenList 1 #define wxLUA_USE_wxPointSizeRect 1 +#define wxLUA_USE_wxPopupWindow 1 +#define wxLUA_USE_wxPopupTransientWindow 1 #define wxLUA_USE_wxPrint 1 #define wxLUA_USE_wxProcess 1 #define wxLUA_USE_wxProgressDialog 1 Index: trunk/wxLua/modules/wxbind/include/wxcore_bind.h =================================================================== --- trunk/wxLua/modules/wxbind/include/wxcore_bind.h (revision 98) +++ trunk/wxLua/modules/wxbind/include/wxcore_bind.h (working copy) @@ -390,6 +390,14 @@ #include "wx/gdicmn.h" #endif // wxLUA_USE_wxPointSizeRect +#if wxLUA_USE_wxPopupTransientWindow + #include "wx/popupwin.h" +#endif // wxLUA_USE_wxPopupTransientWindow + +#if wxLUA_USE_wxPopupWindow + #include "wx/popupwin.h" +#endif // wxLUA_USE_wxPopupWindow + #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE #include "wx/print.h" #include "wx/printdlg.h" @@ -1046,6 +1054,14 @@ extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxSize; #endif // wxLUA_USE_wxPointSizeRect +#if wxLUA_USE_wxPopupTransientWindow + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPopupTransientWindow; +#endif // wxLUA_USE_wxPopupTransientWindow + +#if wxLUA_USE_wxPopupWindow + extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPopupWindow; +#endif // wxLUA_USE_wxPopupWindow + #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPageSetupDialog; extern WXDLLIMPEXP_DATA_BINDWXCORE(int) wxluatype_wxPageSetupDialogData; Index: trunk/wxLua/modules/wxbind/src/wxcore_bind.cpp =================================================================== --- trunk/wxLua/modules/wxbind/src/wxcore_bind.cpp (revision 98) +++ trunk/wxLua/modules/wxbind/src/wxcore_bind.cpp (working copy) @@ -4600,6 +4600,8 @@ static const char* wxluaclassname_wxPoint2DDouble = "wxPoint2DDouble"; static const char* wxluaclassname_wxPoint2DInt = "wxPoint2DInt"; static const char* wxluaclassname_wxPointList = "wxPointList"; +static const char* wxluaclassname_wxPopupTransientWindow = "wxPopupTransientWindow"; +static const char* wxluaclassname_wxPopupWindow = "wxPopupWindow"; static const char* wxluaclassname_wxPostScriptDC = "wxPostScriptDC"; static const char* wxluaclassname_wxPowerEvent = "wxPowerEvent"; static const char* wxluaclassname_wxPreviewCanvas = "wxPreviewCanvas"; @@ -5034,6 +5036,10 @@ static wxLuaBindClass* wxluabaseclassbinds_wxPickerBase[] = { NULL }; static const char* wxluabaseclassnames_wxPointList[] = { wxluaclassname_wxList, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxPointList[] = { NULL }; +static const char* wxluabaseclassnames_wxPopupTransientWindow[] = { wxluaclassname_wxPopupWindow, NULL }; +static wxLuaBindClass* wxluabaseclassbinds_wxPopupTransientWindow[] = { NULL }; +static const char* wxluabaseclassnames_wxPopupWindow[] = { wxluaclassname_wxWindow, NULL }; +static wxLuaBindClass* wxluabaseclassbinds_wxPopupWindow[] = { NULL }; static const char* wxluabaseclassnames_wxPostScriptDC[] = { wxluaclassname_wxDC, NULL }; static wxLuaBindClass* wxluabaseclassbinds_wxPostScriptDC[] = { NULL }; static const char* wxluabaseclassnames_wxPowerEvent[] = { wxluaclassname_wxEvent, NULL }; @@ -6243,6 +6249,18 @@ extern void wxLua_wxSize_delete_function(void** p); #endif // wxLUA_USE_wxPointSizeRect +#if wxLUA_USE_wxPopupTransientWindow + extern wxLuaBindMethod wxPopupTransientWindow_methods[]; + extern int wxPopupTransientWindow_methodCount; + extern void wxLua_wxPopupTransientWindow_delete_function(void** p); +#endif // wxLUA_USE_wxPopupTransientWindow + +#if wxLUA_USE_wxPopupWindow + extern wxLuaBindMethod wxPopupWindow_methods[]; + extern int wxPopupWindow_methodCount; + extern void wxLua_wxPopupWindow_delete_function(void** p); +#endif // wxLUA_USE_wxPopupWindow + #if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE extern wxLuaBindMethod wxPageSetupDialog_methods[]; extern int wxPageSetupDialog_methodCount; @@ -7108,6 +7126,14 @@ { wxluaclassname_wxPointList, wxPointList_methods, wxPointList_methodCount, NULL, &wxluatype_wxPointList, wxluabaseclassnames_wxPointList, wxluabaseclassbinds_wxPointList, NULL, NULL, NULL, 0, &wxLua_wxPointList_delete_function, }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,9,0)) +#if wxLUA_USE_wxPopupTransientWindow + { wxluaclassname_wxPopupTransientWindow, wxPopupTransientWindow_methods, wxPopupTransientWindow_methodCount, CLASSINFO(wxPopupTransientWindow), &wxluatype_wxPopupTransientWindow, wxluabaseclassnames_wxPopupTransientWindow, wxluabaseclassbinds_wxPopupTransientWindow, NULL, NULL, NULL, 0, &wxLua_wxPopupTransientWindow_delete_function, }, +#endif // wxLUA_USE_wxPopupTransientWindow + +#if wxLUA_USE_wxPopupWindow + { wxluaclassname_wxPopupWindow, wxPopupWindow_methods, wxPopupWindow_methodCount, CLASSINFO(wxPopupWindow), &wxluatype_wxPopupWindow, wxluabaseclassnames_wxPopupWindow, wxluabaseclassbinds_wxPopupWindow, NULL, NULL, NULL, 0, &wxLua_wxPopupWindow_delete_function, }, +#endif // wxLUA_USE_wxPopupWindow + #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxUSE_POSTSCRIPT) { wxluaclassname_wxPostScriptDC, wxPostScriptDC_methods, wxPostScriptDC_methodCount, CLASSINFO(wxPostScriptDC), &wxluatype_wxPostScriptDC, wxluabaseclassnames_wxPostScriptDC, wxluabaseclassbinds_wxPostScriptDC, NULL, NULL, NULL, 0, &wxLua_wxPostScriptDC_delete_function, }, #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxUSE_POSTSCRIPT) Index: trunk/wxLua/modules/wxbind/src/wxcore_windows.cpp =================================================================== --- trunk/wxLua/modules/wxbind/src/wxcore_windows.cpp (revision 98) +++ trunk/wxLua/modules/wxbind/src/wxcore_windows.cpp (working copy) @@ -4568,7 +4568,239 @@ #endif // wxLUA_USE_wxWindowList && !wxUSE_STL + +#if wxLUA_USE_wxPopupWindow // --------------------------------------------------------------------------- +// Bind class wxPopupWindow +// --------------------------------------------------------------------------- + +// Lua MetaTable Tag for Class 'wxPopupWindow' +int wxluatype_wxPopupWindow = WXLUA_TUNKNOWN; + +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupWindow_Create[] = { &wxluatype_wxPopupWindow, &wxluatype_wxWindow, &wxluatype_TNUMBER, NULL }; +static int LUACALL wxLua_wxPopupWindow_Create(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupWindow_Create[1] = {{ wxLua_wxPopupWindow_Create, WXLUAMETHOD_METHOD, 2, 3, s_wxluatypeArray_wxLua_wxPopupWindow_Create }}; +// bool Create(wxWindow* parent, int flags = wxBORDER_NONE) +static int LUACALL wxLua_wxPopupWindow_Create(lua_State *L) +{ + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxBORDER_NONE + int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxBORDER_NONE); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow); + // get this + wxPopupWindow * self = (wxPopupWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPopupWindow); + // call Create + bool returns = (self->Create(parent, flags)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; +} + + +#if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPopupWindow) +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupWindow_Position[] = { &wxluatype_wxPopupWindow, &wxluatype_wxPoint, &wxluatype_wxSize, NULL }; +static int LUACALL wxLua_wxPopupWindow_Position(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupWindow_Position[1] = {{ wxLua_wxPopupWindow_Position, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxPopupWindow_Position }}; +// virtual void Position(const wxPoint &ptOrigin, const wxSize &sizePopup) +static int LUACALL wxLua_wxPopupWindow_Position(lua_State *L) +{ + // const wxSize sizePopup + const wxSize * sizePopup = (const wxSize *)wxluaT_getuserdatatype(L, 3, wxluatype_wxSize); + // const wxPoint ptOrigin + const wxPoint * ptOrigin = (const wxPoint *)wxluaT_getuserdatatype(L, 2, wxluatype_wxPoint); + // get this + wxPopupWindow * self = (wxPopupWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPopupWindow); + // call Position + self->Position(*ptOrigin, *sizePopup); + + return 0; +} + +#endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPopupWindow) + +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupWindow_constructor[] = { &wxluatype_wxWindow, &wxluatype_TNUMBER, NULL }; +static int LUACALL wxLua_wxPopupWindow_constructor(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupWindow_constructor[1] = {{ wxLua_wxPopupWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxPopupWindow_constructor }}; +// wxPopupWindow(wxWindow* parent, int flags = wxBORDER_NONE) +static int LUACALL wxLua_wxPopupWindow_constructor(lua_State *L) +{ + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxBORDER_NONE + int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxBORDER_NONE); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWindow); + // call constructor + wxPopupWindow* returns = new wxPopupWindow(parent, flags); + // add to tracked window list, it will check validity + wxluaW_addtrackedwindow(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxPopupWindow); + + return 1; +} + + + + +void wxLua_wxPopupWindow_delete_function(void** p) +{ + wxPopupWindow* o = (wxPopupWindow*)(*p); + delete o; +} + +// Map Lua Class Methods to C Binding Functions +wxLuaBindMethod wxPopupWindow_methods[] = { + { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPopupWindow_Create, 1, NULL }, + +#if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPopupWindow) + { "Position", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPopupWindow_Position, 1, NULL }, +#endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxPopupWindow) + + { "wxPopupWindow", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxPopupWindow_constructor, 1, NULL }, + + { 0, 0, 0, 0 }, +}; + +int wxPopupWindow_methodCount = sizeof(wxPopupWindow_methods)/sizeof(wxLuaBindMethod) - 1; + +#endif // wxLUA_USE_wxPopupWindow + + +#if wxLUA_USE_wxPopupTransientWindow +// --------------------------------------------------------------------------- +// Bind class wxPopupTransientWindow +// --------------------------------------------------------------------------- + +// Lua MetaTable Tag for Class 'wxPopupTransientWindow' +int wxluatype_wxPopupTransientWindow = WXLUA_TUNKNOWN; + +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupTransientWindow_Dismiss[] = { &wxluatype_wxPopupTransientWindow, NULL }; +static int LUACALL wxLua_wxPopupTransientWindow_Dismiss(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupTransientWindow_Dismiss[1] = {{ wxLua_wxPopupTransientWindow_Dismiss, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxPopupTransientWindow_Dismiss }}; +// virtual void Dismiss() +static int LUACALL wxLua_wxPopupTransientWindow_Dismiss(lua_State *L) +{ + // get this + wxPopupTransientWindow * self = (wxPopupTransientWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPopupTransientWindow); + // call Dismiss + self->Dismiss(); + + return 0; +} + +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupTransientWindow_Popup[] = { &wxluatype_wxPopupTransientWindow, &wxluatype_wxWindow, NULL }; +static int LUACALL wxLua_wxPopupTransientWindow_Popup(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupTransientWindow_Popup[1] = {{ wxLua_wxPopupTransientWindow_Popup, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxPopupTransientWindow_Popup }}; +// virtual void Popup(wxWindow *focus = NULL) +static int LUACALL wxLua_wxPopupTransientWindow_Popup(lua_State *L) +{ + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow focus = NULL + wxWindow * focus = (argCount >= 2 ? (wxWindow *)wxluaT_getuserdatatype(L, 2, wxluatype_wxWindow) : NULL); + // get this + wxPopupTransientWindow * self = (wxPopupTransientWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPopupTransientWindow); + // call Popup + self->Popup(focus); + + return 0; +} + +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupTransientWindow_ProcessLeftDown[] = { &wxluatype_wxPopupTransientWindow, &wxluatype_wxMouseEvent, NULL }; +static int LUACALL wxLua_wxPopupTransientWindow_ProcessLeftDown(lua_State *L); +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupTransientWindow_ProcessLeftDown[1] = {{ wxLua_wxPopupTransientWindow_ProcessLeftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxPopupTransientWindow_ProcessLeftDown }}; +// virtual void ProcessLeftDown(wxMouseEvent &event) +static int LUACALL wxLua_wxPopupTransientWindow_ProcessLeftDown(lua_State *L) +{ + // wxMouseEvent event + wxMouseEvent * event = (wxMouseEvent *)wxluaT_getuserdatatype(L, 2, wxluatype_wxMouseEvent); + // get this + wxPopupTransientWindow * self = (wxPopupTransientWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxPopupTransientWindow); + // call ProcessLeftDown + self->ProcessLeftDown(*event); + + return 0; +} + +static wxLuaArgType s_wxluatypeArray_wxLua_wxPopupTransientWindow_constructor1[] = { &wxluatype_wxWindow, &wxluatype_TNUMBER, NULL }; +static int LUACALL wxLua_wxPopupTransientWindow_constructor1(lua_State *L); +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupTransientWindow_constructor1[1] = {{ wxLua_wxPopupTransientWindow_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxPopupTransientWindow_constructor1 }}; +// wxPopupTransientWindow(wxWindow *parent, int flags = wxBORDER_NONE) +static int LUACALL wxLua_wxPopupTransientWindow_constructor1(lua_State *L) +{ + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxBORDER_NONE + int flags = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxBORDER_NONE); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, wxluatype_wxWindow); + // call constructor + wxPopupTransientWindow* returns = new wxPopupTransientWindow(parent, flags); + // add to tracked window list, it will check validity + wxluaW_addtrackedwindow(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxPopupTransientWindow); + + return 1; +} + +static int LUACALL wxLua_wxPopupTransientWindow_constructor(lua_State *L); +// static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupTransientWindow_constructor[1] = {{ wxLua_wxPopupTransientWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }}; +// wxPopupTransientWindow() +static int LUACALL wxLua_wxPopupTransientWindow_constructor(lua_State *L) +{ + // call constructor + wxPopupTransientWindow* returns = new wxPopupTransientWindow(); + // add to tracked window list, it will check validity + wxluaW_addtrackedwindow(L, returns); + // push the constructed class pointer + wxluaT_pushuserdatatype(L, returns, wxluatype_wxPopupTransientWindow); + + return 1; +} + + + + +#if (wxLUA_USE_wxPopupTransientWindow) +// function overload table +static wxLuaBindCFunc s_wxluafunc_wxLua_wxPopupTransientWindow_constructor_overload[] = +{ + { wxLua_wxPopupTransientWindow_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxPopupTransientWindow_constructor1 }, + { wxLua_wxPopupTransientWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, g_wxluaargtypeArray_None }, +}; +static int s_wxluafunc_wxLua_wxPopupTransientWindow_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxPopupTransientWindow_constructor_overload)/sizeof(wxLuaBindCFunc); + +#endif // (wxLUA_USE_wxPopupTransientWindow) + +void wxLua_wxPopupTransientWindow_delete_function(void** p) +{ + wxPopupTransientWindow* o = (wxPopupTransientWindow*)(*p); + delete o; +} + +// Map Lua Class Methods to C Binding Functions +wxLuaBindMethod wxPopupTransientWindow_methods[] = { + { "Dismiss", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPopupTransientWindow_Dismiss, 1, NULL }, + { "Popup", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPopupTransientWindow_Popup, 1, NULL }, + { "ProcessLeftDown", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxPopupTransientWindow_ProcessLeftDown, 1, NULL }, + +#if (wxLUA_USE_wxPopupTransientWindow) + { "wxPopupTransientWindow", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxPopupTransientWindow_constructor_overload, s_wxluafunc_wxLua_wxPopupTransientWindow_constructor_overload_count, 0 }, +#endif // (wxLUA_USE_wxPopupTransientWindow) + + { 0, 0, 0, 0 }, +}; + +int wxPopupTransientWindow_methodCount = sizeof(wxPopupTransientWindow_methods)/sizeof(wxLuaBindMethod) - 1; + +#endif // wxLUA_USE_wxPopupTransientWindow + +// --------------------------------------------------------------------------- // Bind class wxPanel // ---------------------------------------------------------------------------