Applied new master define for CommandBar vs. PocketPC mixed bar.

[wxWidgets.git] / wxPython / src / grid.i

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index bf6b371d04b5434016004bda1034f965855e687e..d63ccda64ffe034186893b69f2b8c8e360bc38b4 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -13,7 +13,8 @@
 %define DOCSTRING
 "Classes for implementing a spreadsheet-like control."
 %enddef
 %define DOCSTRING
 "Classes for implementing a spreadsheet-like control."
 %enddef

-%module(docstring=DOCSTRING) grid
+
+%module(package="wx", docstring=DOCSTRING) grid

 
 
 %{
 
 
 %{


@@ -1546,13 +1547,15 @@ typedef wxGrid::wxGridSelectionModes WXGRIDSELECTIONMODES;
 
 
 
 
 
 

+MustHaveApp(wxGrid);
+

 class wxGrid : public wxScrolledWindow
 {
 public:
     %pythonAppend wxGrid "self._setOORInfo(self)"
 
     wxGrid( wxWindow *parent,
 class wxGrid : public wxScrolledWindow
 {
 public:
     %pythonAppend wxGrid "self._setOORInfo(self)"
 
     wxGrid( wxWindow *parent,

-            wxWindowID id,
+            wxWindowID id=-1,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxWANTS_CHARS,


@@ -1562,7 +1565,7 @@ public:
     
     
     bool Create( wxWindow *parent,
     
     
     bool Create( wxWindow *parent,

-                 wxWindowID id,
+                 wxWindowID id=-1,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxWANTS_CHARS,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxWANTS_CHARS,