Use default window IDs

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

diff --git a/wxPython/src/_splitter.i b/wxPython/src/_splitter.i
index f63483690b4cd8adc0a38488689faea539bc1f24..b149bb8bd2a1900bc9449ddfaa317d5af5ed2ef0 100644 (file)
--- a/wxPython/src/_splitter.i
+++ b/wxPython/src/_splitter.i
@@ -114,7 +114,7 @@ public:
     RefDoc(wxSplitterWindow, ""); // turn it off for the ctors
     
     DocCtorStr(
     RefDoc(wxSplitterWindow, ""); // turn it off for the ctors
     
     DocCtorStr(

-        wxSplitterWindow(wxWindow* parent, wxWindowID id,
+        wxSplitterWindow(wxWindow* parent, wxWindowID id=-1,

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


@@ -128,7 +128,7 @@ public:
 
 
     DocDeclStr(
 
 
     DocDeclStr(

-        bool , Create(wxWindow* parent, wxWindowID id,
+        bool , Create(wxWindow* parent, wxWindowID id=-1,

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

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 37479191f082aab5c6d1c01f57b5923557c82a2b..7f5cb655ec6d63cbddc25d67aa50746ffe5c4bfb 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -30,7 +30,7 @@ DocStr(wxVisualAttributes,
 struct wxVisualAttributes
 {
     %extend {
 struct wxVisualAttributes
 {
     %extend {

-        wxVisualAttributes() {}
+        wxVisualAttributes() { return new wxVisualAttributes; }

         ~wxVisualAttributes() {}
     }
     
         ~wxVisualAttributes() {}
     }
     


@@ -194,7 +194,7 @@ public:
     RefDoc(wxWindow, ""); // turn it off for the ctors
     
     DocCtorStr(
     RefDoc(wxWindow, ""); // turn it off for the ctors
     
     DocCtorStr(

-        wxWindow(wxWindow* parent, const wxWindowID id,
+        wxWindow(wxWindow* parent, const wxWindowID id=-1,

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


@@ -208,7 +208,7 @@ public:
     
 
     DocDeclStr(
     
 
     DocDeclStr(

-        bool , Create(wxWindow* parent, const wxWindowID id,
+        bool , Create(wxWindow* parent, const wxWindowID id=-1,

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


@@ -1010,11 +1010,11 @@ other application.  To bind an event handler function to this hotkey
 use EVT_HOTKEY with an id equal to hotkeyId.  Returns True if the
 hotkey was registered successfully.");
         bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) {
 use EVT_HOTKEY with an id equal to hotkeyId.  Returns True if the
 hotkey was registered successfully.");
         bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) {

-        #if wxUSE_HOTKEY
+        %#if wxUSE_HOTKEY

             return self->RegisterHotKey(hotkeyId, modifiers, keycode);
             return self->RegisterHotKey(hotkeyId, modifiers, keycode);

-        #else
+        %#else

             return False;
             return False;

-        #endif
+        %#endif

         }
 
         
         }