From 3ae53c31534add514fe29c72f2968de6b0fcd41b Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 4 Sep 2001 06:00:45 +0000 Subject: [PATCH] little tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/distrib/make_installer.py | 2 +- wxPython/src/grid.i | 33 ------------------------------ wxPython/src/msw/grid.cpp | 2 ++ 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 6117abe3f7..73e516f448 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -100,7 +100,7 @@ Source: "demo\data\*.py"; DestDir: "{app}\wxPython\demo\data"; Source: "demo\data\*.png"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.bmp"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.i"; DestDir: "{app}\wxPython\demo\data"; Components: demo -Source: "demo\data\*.h"; DestDir: "{app}\wxPython\demo\data"; Components: demo +;;Source: "demo\data\*.h"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.txt"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.wav"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.wdr"; DestDir: "{app}\wxPython\demo\data"; Components: demo diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index 72ca7ec3ca..b9e0a9c81d 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -1281,24 +1281,6 @@ public: int GetNumberCols(); - -#ifdef NOTNEEDED // ???? - // ------ display update functions - // - void CalcRowLabelsExposed( wxRegion& reg ); - void CalcColLabelsExposed( wxRegion& reg ); - void CalcCellsExposed( wxRegion& reg ); - - // ------ event handlers - // - void ProcessRowLabelMouseEvent( wxMouseEvent& event ); - void ProcessColLabelMouseEvent( wxMouseEvent& event ); - void ProcessCornerLabelMouseEvent( wxMouseEvent& event ); - void ProcessGridCellMouseEvent( wxMouseEvent& event ); - void DoEndDragResizeRow(); - void DoEndDragResizeCol(); -#endif - bool ProcessTableMessage( wxGridTableMessage& ); @@ -1315,26 +1297,11 @@ public: bool AppendCols( int numCols = 1, bool updateLabels=TRUE ); bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE ); -#ifdef NOTNEEDED // ???? - void DrawGridCellArea( wxDC& dc ); - void DrawGridSpace( wxDC& dc ); - void DrawCellBorder( wxDC& dc, const wxGridCellCoords& ); - void DrawAllGridLines( wxDC& dc, const wxRegion & reg ); - void DrawCell( wxDC& dc, const wxGridCellCoords& ); - void DrawHighlight(wxDC& dc); -#endif // this function is called when the current cell highlight must be redrawn // and may be overridden by the user virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr ); -#ifdef NOTNEEDED // ???? - void DrawRowLabels( wxDC& dc ); - void DrawRowLabel( wxDC& dc, int row ); - - void DrawColLabels( wxDC& dc ); - void DrawColLabel( wxDC& dc, int col ); -#endif // ------ Cell text drawing functions // diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp index aa65a43ed1..6c3ee04f4b 100644 --- a/wxPython/src/msw/grid.cpp +++ b/wxPython/src/msw/grid.cpp @@ -14109,6 +14109,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_char","_wxChar",0}, { "_wxGridCellStringRenderer","_wxGridCellFloatRenderer",SwigwxGridCellFloatRendererTowxGridCellStringRenderer}, { "_wxGridCellStringRenderer","_wxGridCellNumberRenderer",SwigwxGridCellNumberRendererTowxGridCellStringRenderer}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_wxGridTableBase","_wxGridStringTable",SwigwxGridStringTableTowxGridTableBase}, { "_wxGridTableBase","_wxPyGridTableBase",SwigwxPyGridTableBaseTowxGridTableBase}, { "_EBool","_WXGRIDSELECTIONMODES",0}, @@ -14128,6 +14129,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_WXGRIDSELECTIONMODES","_time_t",0}, { "_WXGRIDSELECTIONMODES","_wxPrintQuality",0}, { "_WXGRIDSELECTIONMODES","_wxCoord",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_WXGRIDSELECTIONMODES",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, -- 2.45.2