Some minor build issues for wxGTK

Some sources (from .i files) for wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/modules/html/html.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : ./html.cpp
+ * FILE : html.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)

utils/wxPython/modules/html/htmlhelp.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : ./htmlhelp.cpp
+ * FILE : htmlhelp.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -2683,7 +2683,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTreeCtrl","_wxTreeCtrl",0},
     { "_wxMask","_class_wxMask",0},
     { "_wxToolTip","_class_wxToolTip",0},
-    { "_wxGrid","_class_wxGrid",0},
     { "_wxPNGHandler","_class_wxPNGHandler",0},
     { "_class_wxHtmlEasyPrinting","_wxHtmlEasyPrinting",0},
     { "_class_wxColourData","_wxColourData",0},
@@ -2692,6 +2691,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxHtmlHelpController","_wxHtmlHelpController",0},
     { "_wxPen","_class_wxPen",0},
     { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
+    { "_class_wxNotebookSizer","_wxNotebookSizer",0},
     { "_wxHtmlColourCell","_class_wxHtmlColourCell",0},
     { "_byte","_unsigned_char",0},
     { "_wxDataObject","_class_wxDataObject",0},
@@ -2753,7 +2753,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxTextDataObject","_class_wxTextDataObject",0},
     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_class_wxToolTip","_wxToolTip",0},
-    { "_class_wxGrid","_wxGrid",0},
     { "_class_wxPNGHandler","_wxPNGHandler",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
@@ -2787,7 +2786,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxSplitterEvent","_class_wxSplitterEvent",0},
-    { "_wxGridEvent","_class_wxGridEvent",0},
     { "_wxRect","_class_wxRect",0},
     { "_wxCommandEvent","_class_wxCommandEvent",0},
     { "_wxSizeEvent","_class_wxSizeEvent",0},
@@ -2801,7 +2799,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxBoxSizer","_class_wxBoxSizer",0},
     { "_wxHtmlCell","_class_wxHtmlCell",0},
     { "_wxBitmap","_class_wxBitmap",0},
-    { "_char","_wxDash",0},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxPyTimer","_class_wxPyTimer",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
@@ -2879,6 +2876,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_int","_wxWindowID",0},
     { "_signed_int","_int",0},
     { "_class_wxTextCtrl","_wxTextCtrl",0},
+    { "_class_wxListItemAttr","_wxListItemAttr",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
     { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
@@ -2924,7 +2922,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPoint","_wxPoint",0},
     { "_wxRealPoint","_class_wxRealPoint",0},
     { "_class_wxRadioBox","_wxRadioBox",0},
-    { "_wxGridCell","_class_wxGridCell",0},
     { "_class_wxBoxSizer","_wxBoxSizer",0},
     { "_class_wxHtmlWinParser","_wxHtmlWinParser",0},
     { "_class_wxHtmlCell","_wxHtmlCell",0},
@@ -3072,14 +3069,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_wxHtmlParser","_class_wxHtmlParser",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
-    { "_class_wxGridEvent","_wxGridEvent",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},
     { "_class_wxListCtrl","_wxListCtrl",0},
     { "_class_wxPyHtmlWinTagHandler","_wxPyHtmlWinTagHandler",0},
     { "_wxCustomDataObject","_class_wxCustomDataObject",0},
-    { "_class_wxGridCell","_wxGridCell",0},
     { "_HtmlHistoryItem","_class_HtmlHistoryItem",0},
     { "_class_wxSize","_wxSize",0},
     { "_class_wxBitmap","_wxBitmap",0},
@@ -3097,8 +3092,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxScrollBar","_wxScrollBar",0},
     { "_class_wxColourDialog","_wxColourDialog",0},
     { "_class_wxPrintData","_wxPrintData",0},
-    { "_wxDash","_char",0},
     { "_class_wxScrolledWindow","_wxScrolledWindow",0},
+    { "_wxListItemAttr","_class_wxListItemAttr",0},
     { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
     { "_class_wxConfig","_wxConfig",0},
     { "_wxKeyEvent","_class_wxKeyEvent",0},
@@ -3110,6 +3105,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPalette","_wxPalette",0},
     { "_wxFileDataObject","_class_wxFileDataObject",0},
     { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
+    { "_wxNotebookSizer","_class_wxNotebookSizer",0},
     { "_class_wxEraseEvent","_wxEraseEvent",0},
     { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0},
     { "_wxMDIClientWindow","_class_wxMDIClientWindow",0},

utils/wxPython/modules/ogl/build.cfg

@@ -11,7 +11,7 @@ OTHERCFLAGS = '-I$(WXWIN)/contrib/include'
 if sys.platform == 'win32':
     OTHERLIBS = '$(WXWIN)/contrib/lib/ogl$(LIBEXT).lib'
 else:
-    OTHERLIBS = '-L$(WXWIN)/build/contrib/lib -logl'
+    OTHERLIBS = '-logl'
 
 #OTHERSWIGFLAGS = '-stat'
 SWIGDEPS = '_ogldefs.i'

utils/wxPython/modules/stc/build.cfg

@@ -11,7 +11,7 @@ OTHERCFLAGS = '-I$(WXWIN)/contrib/include'
 if sys.platform == 'win32':
     OTHERLIBS = '$(WXWIN)/contrib/lib/stc$(LIBEXT).lib'
 else:
-    OTHERLIBS = '-L$(WXWIN)/build/contrib/lib -lstc'
+    OTHERLIBS = '-lstc'
 
 
 

utils/wxPython/src/gtk/clip_dnd.cpp

@@ -137,9 +137,12 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) {
     if (m_myInst.findCallback("GetDataHere")) {
         PyObject* ro;
         ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
-        rval = (ro != Py_None && PyString_Check(ro));
+        if (ro) {
-        if (rval)
+            rval = (ro != Py_None && PyString_Check(ro));
-            memcpy(buf, PyString_AsString(ro), PyString_Size(ro));
+            if (rval)
+                memcpy(buf, PyString_AsString(ro), PyString_Size(ro));
+            Py_DECREF(ro);
+        }
     }
     wxPySaveThread(doSave);
     return rval;
@@ -192,8 +195,11 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() {
         PyObject* ro;
         wxBitmap* ptr;
         ro = m_myInst.callCallbackObj(Py_BuildValue("()"));
-        if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxBitmap_p"))
+        if (ro) {
-            rval = ptr;
+            if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxBitmap_p"))
+                rval = ptr;
+            Py_DECREF(ro);
+        }
     }
     wxPySaveThread(doSave);
     return *rval;

utils/wxPython/src/gtk/windows.cpp

@@ -131,7 +131,10 @@ public:
         if (self->m_myInst.findCallback("Clone")) {
             PyObject* ro;
             ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
-            SWIG_GetPtrObj(ro, (void **)&ptr, "_wxPyValidator_p");
+            if (ro) {
+                SWIG_GetPtrObj(ro, (void **)&ptr, "_wxPyValidator_p");
+                Py_DECREF(ro);
+            }
         }
         // This is very dangerous!!! But is the only way I could find
         // to squash a memory leak.  Currently it is okay, but if the

utils/wxPython/src/gtk/windows2.py

@@ -13,378 +13,6 @@ from controls import *
 
 from events import *
 import wx
-class wxGridCellPtr :
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def __del__(self,windows2c=windows2c):
-        if self.thisown == 1 :
-            windows2c.delete_wxGridCell(self)
-    def GetTextValue(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetTextValue,(self,) + _args, _kwargs)
-        return val
-    def SetTextValue(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_SetTextValue,(self,) + _args, _kwargs)
-        return val
-    def GetFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def SetFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_SetFont,(self,) + _args, _kwargs)
-        return val
-    def GetTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def SetTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_SetTextColour,(self,) + _args, _kwargs)
-        return val
-    def GetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def SetBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_SetBackgroundColour,(self,) + _args, _kwargs)
-        return val
-    def GetBackgroundBrush(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetBackgroundBrush,(self,) + _args, _kwargs)
-        if val: val = wxBrushPtr(val) 
-        return val
-    def GetAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetAlignment,(self,) + _args, _kwargs)
-        return val
-    def SetAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_SetAlignment,(self,) + _args, _kwargs)
-        return val
-    def GetCellBitmap(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_GetCellBitmap,(self,) + _args, _kwargs)
-        if val: val = wxBitmapPtr(val) 
-        return val
-    def SetCellBitmap(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridCell_SetCellBitmap,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxGridCell instance at %s>" % (self.this,)
-class wxGridCell(wxGridCellPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows2c.new_wxGridCell,_args,_kwargs)
-        self.thisown = 1
-
-
-
-
-class wxGridPtr(wxPanelPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def AdjustScrollbars(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_AdjustScrollbars,(self,) + _args, _kwargs)
-        return val
-    def AppendCols(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_AppendCols,(self,) + _args, _kwargs)
-        return val
-    def AppendRows(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_AppendRows,(self,) + _args, _kwargs)
-        return val
-    def BeginBatch(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_BeginBatch,(self,) + _args, _kwargs)
-        return val
-    def CellHitTest(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_CellHitTest,(self,) + _args, _kwargs)
-        return val
-    def CreateGrid(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_CreateGrid,(self,) + _args, _kwargs)
-        return val
-    def CurrentCellVisible(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_CurrentCellVisible,(self,) + _args, _kwargs)
-        return val
-    def DeleteCols(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_DeleteCols,(self,) + _args, _kwargs)
-        return val
-    def DeleteRows(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_DeleteRows,(self,) + _args, _kwargs)
-        return val
-    def EndBatch(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_EndBatch,(self,) + _args, _kwargs)
-        return val
-    def GetBatchCount(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetBatchCount,(self,) + _args, _kwargs)
-        return val
-    def GetCell(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCell,(self,) + _args, _kwargs)
-        if val: val = wxGridCellPtr(val) 
-        return val
-    def GetCellAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCellAlignment,(self,) + _args, _kwargs)
-        return val
-    def GetDefCellAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetDefCellAlignment,(self,) + _args, _kwargs)
-        return val
-    def GetCellBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCellBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetDefCellBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetDefCellBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetCells(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCells,(self,) + _args, _kwargs)
-        return val
-    def GetCellTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCellTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetDefCellTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetDefCellTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetCellTextFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCellTextFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def GetDefCellTextFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetDefCellTextFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def GetCellValue(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCellValue,(self,) + _args, _kwargs)
-        return val
-    def GetCols(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCols,(self,) + _args, _kwargs)
-        return val
-    def GetColumnWidth(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetColumnWidth,(self,) + _args, _kwargs)
-        return val
-    def GetCurrentRect(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCurrentRect,(self,) + _args, _kwargs)
-        if val: val = wxRectPtr(val) ; val.thisown = 1
-        return val
-    def GetCursorColumn(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCursorColumn,(self,) + _args, _kwargs)
-        return val
-    def GetCursorRow(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetCursorRow,(self,) + _args, _kwargs)
-        return val
-    def GetEditable(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetEditable,(self,) + _args, _kwargs)
-        return val
-    def GetHorizScrollBar(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetHorizScrollBar,(self,) + _args, _kwargs)
-        if val: val = wxScrollBarPtr(val) 
-        return val
-    def GetLabelAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetLabelAlignment,(self,) + _args, _kwargs)
-        return val
-    def GetLabelBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetLabelBackgroundColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetLabelSize(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetLabelSize,(self,) + _args, _kwargs)
-        return val
-    def GetLabelTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetLabelTextColour,(self,) + _args, _kwargs)
-        if val: val = wxColourPtr(val) 
-        return val
-    def GetLabelTextFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetLabelTextFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
-        return val
-    def GetLabelValue(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetLabelValue,(self,) + _args, _kwargs)
-        return val
-    def GetRowHeight(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetRowHeight,(self,) + _args, _kwargs)
-        return val
-    def GetRows(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetRows,(self,) + _args, _kwargs)
-        return val
-    def GetScrollPosX(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetScrollPosX,(self,) + _args, _kwargs)
-        return val
-    def GetScrollPosY(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetScrollPosY,(self,) + _args, _kwargs)
-        return val
-    def GetTextItem(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetTextItem,(self,) + _args, _kwargs)
-        if val: val = wxTextCtrlPtr(val) 
-        return val
-    def GetVertScrollBar(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetVertScrollBar,(self,) + _args, _kwargs)
-        if val: val = wxScrollBarPtr(val) 
-        return val
-    def InsertCols(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_InsertCols,(self,) + _args, _kwargs)
-        return val
-    def InsertRows(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_InsertRows,(self,) + _args, _kwargs)
-        return val
-    def OnActivate(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_OnActivate,(self,) + _args, _kwargs)
-        return val
-    def SetCellAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetCellAlignment,(self,) + _args, _kwargs)
-        return val
-    def SetDefCellAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetDefCellAlignment,(self,) + _args, _kwargs)
-        return val
-    def SetCellBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetCellBackgroundColour,(self,) + _args, _kwargs)
-        return val
-    def SetDefCellBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetDefCellBackgroundColour,(self,) + _args, _kwargs)
-        return val
-    def SetCellTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetCellTextColour,(self,) + _args, _kwargs)
-        return val
-    def SetDefCellTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetDefCellTextColour,(self,) + _args, _kwargs)
-        return val
-    def SetCellTextFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetCellTextFont,(self,) + _args, _kwargs)
-        return val
-    def SetDefCellTextFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetDefCellTextFont,(self,) + _args, _kwargs)
-        return val
-    def SetCellValue(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetCellValue,(self,) + _args, _kwargs)
-        return val
-    def SetColumnWidth(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetColumnWidth,(self,) + _args, _kwargs)
-        return val
-    def SetDividerPen(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetDividerPen,(self,) + _args, _kwargs)
-        return val
-    def SetEditable(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetEditable,(self,) + _args, _kwargs)
-        return val
-    def SetGridCursor(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetGridCursor,(self,) + _args, _kwargs)
-        return val
-    def SetLabelAlignment(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetLabelAlignment,(self,) + _args, _kwargs)
-        return val
-    def SetLabelBackgroundColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetLabelBackgroundColour,(self,) + _args, _kwargs)
-        return val
-    def SetLabelSize(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetLabelSize,(self,) + _args, _kwargs)
-        return val
-    def SetLabelTextColour(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetLabelTextColour,(self,) + _args, _kwargs)
-        return val
-    def SetLabelTextFont(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetLabelTextFont,(self,) + _args, _kwargs)
-        return val
-    def SetLabelValue(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetLabelValue,(self,) + _args, _kwargs)
-        return val
-    def SetRowHeight(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetRowHeight,(self,) + _args, _kwargs)
-        return val
-    def UpdateDimensions(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_UpdateDimensions,(self,) + _args, _kwargs)
-        return val
-    def GetEditInPlace(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_GetEditInPlace,(self,) + _args, _kwargs)
-        return val
-    def SetEditInPlace(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGrid_SetEditInPlace,(self,) + _args, _kwargs)
-        return val
-    def __repr__(self):
-        return "<C wxGrid instance at %s>" % (self.this,)
-class wxGrid(wxGridPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = apply(windows2c.new_wxGrid,_args,_kwargs)
-        self.thisown = 1
-        wx._StdWindowCallbacks(self)
-        wx._checkForCallback(self, 'OnSelectCell',           wxEVT_GRID_SELECT_CELL)
-        wx._checkForCallback(self, 'OnCreateCell',           wxEVT_GRID_CREATE_CELL)
-        wx._checkForCallback(self, 'OnChangeLabels',         wxEVT_GRID_CHANGE_LABELS)
-        wx._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)
-        wx._checkForCallback(self, 'OnCellChange',           wxEVT_GRID_CELL_CHANGE)
-        wx._checkForCallback(self, 'OnCellLeftClick',        wxEVT_GRID_CELL_LCLICK)
-        wx._checkForCallback(self, 'OnCellRightClick',       wxEVT_GRID_CELL_RCLICK)
-        wx._checkForCallback(self, 'OnLabelLeftClick',       wxEVT_GRID_LABEL_LCLICK)
-        wx._checkForCallback(self, 'OnLabelRightClick',      wxEVT_GRID_LABEL_RCLICK)
-
-
-
-
-class wxGridEventPtr(wxEventPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def GetRow(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridEvent_GetRow,(self,) + _args, _kwargs)
-        return val
-    def GetCol(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridEvent_GetCol,(self,) + _args, _kwargs)
-        return val
-    def GetPosition(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridEvent_GetPosition,(self,) + _args, _kwargs)
-        if val: val = wxPointPtr(val) ; val.thisown = 1
-        return val
-    def ControlDown(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridEvent_ControlDown,(self,) + _args, _kwargs)
-        return val
-    def ShiftDown(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridEvent_ShiftDown,(self,) + _args, _kwargs)
-        return val
-    def GetCell(self, *_args, **_kwargs):
-        val = apply(windows2c.wxGridEvent_GetCell,(self,) + _args, _kwargs)
-        if val: val = wxGridCellPtr(val) 
-        return val
-    def __setattr__(self,name,value):
-        if name == "m_row" :
-            windows2c.wxGridEvent_m_row_set(self,value)
-            return
-        if name == "m_col" :
-            windows2c.wxGridEvent_m_col_set(self,value)
-            return
-        if name == "m_x" :
-            windows2c.wxGridEvent_m_x_set(self,value)
-            return
-        if name == "m_y" :
-            windows2c.wxGridEvent_m_y_set(self,value)
-            return
-        if name == "m_control" :
-            windows2c.wxGridEvent_m_control_set(self,value)
-            return
-        if name == "m_shift" :
-            windows2c.wxGridEvent_m_shift_set(self,value)
-            return
-        if name == "m_cell" :
-            windows2c.wxGridEvent_m_cell_set(self,value.this)
-            return
-        self.__dict__[name] = value
-    def __getattr__(self,name):
-        if name == "m_row" : 
-            return windows2c.wxGridEvent_m_row_get(self)
-        if name == "m_col" : 
-            return windows2c.wxGridEvent_m_col_get(self)
-        if name == "m_x" : 
-            return windows2c.wxGridEvent_m_x_get(self)
-        if name == "m_y" : 
-            return windows2c.wxGridEvent_m_y_get(self)
-        if name == "m_control" : 
-            return windows2c.wxGridEvent_m_control_get(self)
-        if name == "m_shift" : 
-            return windows2c.wxGridEvent_m_shift_get(self)
-        if name == "m_cell" : 
-            return wxGridCellPtr(windows2c.wxGridEvent_m_cell_get(self))
-        raise AttributeError,name
-    def __repr__(self):
-        return "<C wxGridEvent instance at %s>" % (self.this,)
-class wxGridEvent(wxGridEventPtr):
-    def __init__(self,this):
-        self.this = this
-
-
-
-
 class wxNotebookEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
@@ -586,15 +214,3 @@ class wxSplitterWindow(wxSplitterWindowPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
-wxGRID_TEXT_CTRL = windows2c.wxGRID_TEXT_CTRL
-wxGRID_HSCROLL = windows2c.wxGRID_HSCROLL
-wxGRID_VSCROLL = windows2c.wxGRID_VSCROLL
-wxEVT_GRID_SELECT_CELL = windows2c.wxEVT_GRID_SELECT_CELL
-wxEVT_GRID_CREATE_CELL = windows2c.wxEVT_GRID_CREATE_CELL
-wxEVT_GRID_CHANGE_LABELS = windows2c.wxEVT_GRID_CHANGE_LABELS
-wxEVT_GRID_CHANGE_SEL_LABEL = windows2c.wxEVT_GRID_CHANGE_SEL_LABEL
-wxEVT_GRID_CELL_CHANGE = windows2c.wxEVT_GRID_CELL_CHANGE
-wxEVT_GRID_CELL_LCLICK = windows2c.wxEVT_GRID_CELL_LCLICK
-wxEVT_GRID_CELL_RCLICK = windows2c.wxEVT_GRID_CELL_RCLICK
-wxEVT_GRID_LABEL_LCLICK = windows2c.wxEVT_GRID_LABEL_LCLICK
-wxEVT_GRID_LABEL_RCLICK = windows2c.wxEVT_GRID_LABEL_RCLICK

utils/wxPython/src/gtk/wx.cpp

@@ -635,6 +635,7 @@ extern "C" SWIGEXPORT(void) initimagec();
 extern "C" SWIGEXPORT(void) initprintfwc();
 extern "C" SWIGEXPORT(void) initsizersc();
 extern "C" SWIGEXPORT(void) initclip_dndc();
+extern "C" SWIGEXPORT(void) initgridc();
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1672,7 +1673,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTreeCtrl","_wxTreeCtrl",0},
     { "_wxMask","_class_wxMask",0},
     { "_wxToolTip","_class_wxToolTip",0},
-    { "_wxGrid","_class_wxGrid",0},
     { "_wxPNGHandler","_class_wxPNGHandler",0},
     { "_class_wxColourData","_wxColourData",0},
     { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
@@ -1740,7 +1740,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxTextDataObject","_class_wxTextDataObject",0},
     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_class_wxToolTip","_wxToolTip",0},
-    { "_class_wxGrid","_wxGrid",0},
     { "_class_wxPNGHandler","_wxPNGHandler",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
@@ -1773,7 +1772,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxEvent","_wxEvent",0},
     { "_wxCheckListBox","_class_wxCheckListBox",0},
     { "_wxSplitterEvent","_class_wxSplitterEvent",0},
-    { "_wxGridEvent","_class_wxGridEvent",0},
     { "_wxRect","_class_wxRect",0},
     { "_wxCommandEvent","_class_wxCommandEvent",0},
     { "_wxSizeEvent","_class_wxSizeEvent",0},
@@ -1893,7 +1891,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPoint","_wxPoint",0},
     { "_wxRealPoint","_class_wxRealPoint",0},
     { "_class_wxRadioBox","_wxRadioBox",0},
-    { "_wxGridCell","_class_wxGridCell",0},
     { "_class_wxBoxSizer","_wxBoxSizer",0},
     { "_signed_short","_WXTYPE",0},
     { "_signed_short","_short",0},
@@ -2025,13 +2022,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},
-    { "_class_wxGridEvent","_wxGridEvent",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
     { "_class_wxSizeEvent","_wxSizeEvent",0},
     { "_class_wxListCtrl","_wxListCtrl",0},
     { "_wxCustomDataObject","_class_wxCustomDataObject",0},
-    { "_class_wxGridCell","_wxGridCell",0},
     { "_class_wxSize","_wxSize",0},
     { "_class_wxBitmap","_wxBitmap",0},
     { "_class_wxMemoryDC","_wxMemoryDC",0},
@@ -2777,6 +2772,7 @@ SWIGEXPORT(void) initwxc() {
     initprintfwc();
     initsizersc();
     initclip_dndc();
+    initgridc();
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)