Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1034/wxLua/modules/wxbind/src
Modified Files:
wx_bind.cpp wxlhtmlwin.cpp
Log Message:
Finished cleaning up the code, removed all code from internal.h and internal.cpp
and moved it to other files. Do not #include internal.h anymore!
Have the functions in wxLuaState that only call C lua funcs call C helper funcs in wxlstate.cpp
so that you don't have to create a wxLuaState if you don't really need it.
Index: wxlhtmlwin.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlhtmlwin.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wxlhtmlwin.cpp 17 Apr 2006 13:58:54 -0000 1.10
--- wxlhtmlwin.cpp 28 Aug 2006 05:26:20 -0000 1.11
***************
*** 27,31 ****
#include "wxlua/include/wxlstate.h"
#include "wxlua/include/wxlcallb.h"
- #include "wxlua/include/internal.h"
#if wxLUA_USE_wxHTML
--- 27,30 ----
Index: wx_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** wx_bind.cpp 24 Aug 2006 05:12:27 -0000 1.53
--- wx_bind.cpp 28 Aug 2006 05:26:20 -0000 1.54
***************
*** 63,71 ****
#if defined(__MINGW32__) || defined(__GNUWIN32__)
// FIX: "internal compiler error: output_operand: invalid expression as operand"
! const wxPoint wxDefaultPositionHack = wxDefaultPosition;
! const wxSize wxDefaultSizeHack = wxDefaultSize;
! #define wxDefaultPosition wxDefaultPositionHack
! #define wxDefaultSize wxDefaultSizeHack
! #endif //__MINGW32__
// ----------------------------------------------------------------------------
--- 63,71 ----
#if defined(__MINGW32__) || defined(__GNUWIN32__)
// FIX: "internal compiler error: output_operand: invalid expression as operand"
! const wxPoint wxLua_wxDefaultPositionHack = wxDefaultPosition;
! const wxSize wxLua_wxDefaultSizeHack = wxDefaultSize;
! #define wxDefaultPosition wxLua_wxDefaultPositionHack
! #define wxDefaultSize wxLua_wxDefaultSizeHack
! #endif //__MINGW32__
// ----------------------------------------------------------------------------
***************
*** 6018,6059 ****
{
// ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX
! wxLua_wxBLACK = (wxColour*)wxBLACK;
! wxLua_wxWHITE = (wxColour*)wxWHITE;
! wxLua_wxRED = (wxColour*)wxRED;
! wxLua_wxBLUE = (wxColour*)wxBLUE;
! wxLua_wxGREEN = (wxColour*)wxGREEN;
! wxLua_wxCYAN = (wxColour*)wxCYAN;
! wxLua_wxLIGHT_GREY = (wxColour*)wxLIGHT_GREY;
! wxLua_wxRED_PEN = (wxPen*)wxRED_PEN;
! wxLua_wxCYAN_PEN = (wxPen*)wxCYAN_PEN;
! wxLua_wxGREEN_PEN = (wxPen*)wxGREEN_PEN;
! wxLua_wxBLACK_PEN = (wxPen*)wxBLACK_PEN;
! wxLua_wxWHITE_PEN = (wxPen*)wxWHITE_PEN;
! wxLua_wxTRANSPARENT_PEN = (wxPen*)wxTRANSPARENT_PEN;
! wxLua_wxBLACK_DASHED_PEN = (wxPen*)wxBLACK_DASHED_PEN;
! wxLua_wxGREY_PEN = (wxPen*)wxGREY_PEN;
! wxLua_wxMEDIUM_GREY_PEN = (wxPen*)wxMEDIUM_GREY_PEN;
! wxLua_wxLIGHT_GREY_PEN = (wxPen*)wxLIGHT_GREY_PEN;
! wxLua_wxBLUE_BRUSH = (wxBrush*)wxBLUE_BRUSH;
! wxLua_wxGREEN_BRUSH = (wxBrush*)wxGREEN_BRUSH;
! wxLua_wxWHITE_BRUSH = (wxBrush*)wxWHITE_BRUSH;
! wxLua_wxBLACK_BRUSH = (wxBrush*)wxBLACK_BRUSH;
! wxLua_wxGREY_BRUSH = (wxBrush*)wxGREY_BRUSH;
! wxLua_wxMEDIUM_GREY_BRUSH = (wxBrush*)wxMEDIUM_GREY_BRUSH;
! wxLua_wxLIGHT_GREY_BRUSH = (wxBrush*)wxLIGHT_GREY_BRUSH;
! wxLua_wxTRANSPARENT_BRUSH = (wxBrush*)wxTRANSPARENT_BRUSH;
! wxLua_wxCYAN_BRUSH = (wxBrush*)wxCYAN_BRUSH;
! wxLua_wxRED_BRUSH = (wxBrush*)wxRED_BRUSH;
! wxLua_wxNORMAL_FONT = (wxFont*)wxNORMAL_FONT;
! wxLua_wxSMALL_FONT = (wxFont*)wxSMALL_FONT;
! wxLua_wxITALIC_FONT = (wxFont*)wxITALIC_FONT;
! wxLua_wxSWISS_FONT = (wxFont*)wxSWISS_FONT;
! wxLua_wxSTANDARD_CURSOR = (wxCursor*)wxSTANDARD_CURSOR;
! wxLua_wxHOURGLASS_CURSOR = (wxCursor*)wxHOURGLASS_CURSOR;
! wxLua_wxCROSS_CURSOR = (wxCursor*)wxCROSS_CURSOR;
}
void wxLuaBinding_wx::PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)
--- 6018,6062 ----
{
// ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX
! if (wxLua_wxBLACK == NULL)
! {
! wxLua_wxBLACK = (wxColour*)wxBLACK;
! wxLua_wxWHITE = (wxColour*)wxWHITE;
! wxLua_wxRED = (wxColour*)wxRED;
! wxLua_wxBLUE = (wxColour*)wxBLUE;
! wxLua_wxGREEN = (wxColour*)wxGREEN;
! wxLua_wxCYAN = (wxColour*)wxCYAN;
! wxLua_wxLIGHT_GREY = (wxColour*)wxLIGHT_GREY;
! wxLua_wxRED_PEN = (wxPen*)wxRED_PEN;
! wxLua_wxCYAN_PEN = (wxPen*)wxCYAN_PEN;
! wxLua_wxGREEN_PEN = (wxPen*)wxGREEN_PEN;
! wxLua_wxBLACK_PEN = (wxPen*)wxBLACK_PEN;
! wxLua_wxWHITE_PEN = (wxPen*)wxWHITE_PEN;
! wxLua_wxTRANSPARENT_PEN = (wxPen*)wxTRANSPARENT_PEN;
! wxLua_wxBLACK_DASHED_PEN = (wxPen*)wxBLACK_DASHED_PEN;
! wxLua_wxGREY_PEN = (wxPen*)wxGREY_PEN;
! wxLua_wxMEDIUM_GREY_PEN = (wxPen*)wxMEDIUM_GREY_PEN;
! wxLua_wxLIGHT_GREY_PEN = (wxPen*)wxLIGHT_GREY_PEN;
! wxLua_wxBLUE_BRUSH = (wxBrush*)wxBLUE_BRUSH;
! wxLua_wxGREEN_BRUSH = (wxBrush*)wxGREEN_BRUSH;
! wxLua_wxWHITE_BRUSH = (wxBrush*)wxWHITE_BRUSH;
! wxLua_wxBLACK_BRUSH = (wxBrush*)wxBLACK_BRUSH;
! wxLua_wxGREY_BRUSH = (wxBrush*)wxGREY_BRUSH;
! wxLua_wxMEDIUM_GREY_BRUSH = (wxBrush*)wxMEDIUM_GREY_BRUSH;
! wxLua_wxLIGHT_GREY_BRUSH = (wxBrush*)wxLIGHT_GREY_BRUSH;
! wxLua_wxTRANSPARENT_BRUSH = (wxBrush*)wxTRANSPARENT_BRUSH;
! wxLua_wxCYAN_BRUSH = (wxBrush*)wxCYAN_BRUSH;
! wxLua_wxRED_BRUSH = (wxBrush*)wxRED_BRUSH;
! wxLua_wxNORMAL_FONT = (wxFont*)wxNORMAL_FONT;
! wxLua_wxSMALL_FONT = (wxFont*)wxSMALL_FONT;
! wxLua_wxITALIC_FONT = (wxFont*)wxITALIC_FONT;
! wxLua_wxSWISS_FONT = (wxFont*)wxSWISS_FONT;
! wxLua_wxSTANDARD_CURSOR = (wxCursor*)wxSTANDARD_CURSOR;
! wxLua_wxHOURGLASS_CURSOR = (wxCursor*)wxHOURGLASS_CURSOR;
! wxLua_wxCROSS_CURSOR = (wxCursor*)wxCROSS_CURSOR;
! }
}
void wxLuaBinding_wx::PostRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable)
|
