changes to match recent CVS updates

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

diff --git a/wxPython/contrib/glcanvas/msw/myglcanvas.h b/wxPython/contrib/glcanvas/msw/myglcanvas.h
index e9ac0a7958cbc4b02f7a476532048605f04cd47f..5dd269da72e2a32bb062c80b0ea93dafd4cce59c 100644 (file)
--- a/wxPython/contrib/glcanvas/msw/myglcanvas.h
+++ b/wxPython/contrib/glcanvas/msw/myglcanvas.h
@@ -25,7 +25,7 @@
 
 #include <windows.h>
 
-#include "gl/gl.h"
+#include <GL/gl.h>
 
 //---------------------------------------------------------------------------
 // Constants for attriblist

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index fad06d17dfd67ae856f7fc2bcb6bcbc98f45a135..8cbfd8782e1cddca8613c515a8949c219f2dd4f2 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -312,8 +312,15 @@ enum {
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
     wxST_NO_AUTORESIZE,
-    wxBU_AUTODRAW,
+
     wxBU_NOAUTODRAW,
+    wxBU_AUTODRAW,
+    wxBU_LEFT,
+    wxBU_TOP,
+    wxBU_RIGHT,
+    wxBU_BOTTOM,
+    wxBU_EXACTFIT,
+
     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,
@@ -326,7 +333,6 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
-    //wxSP_SASH_AQUA,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
@@ -973,6 +979,8 @@ enum wxEventType {
  wxEVT_NC_MIDDLE_DCLICK,
  wxEVT_NC_RIGHT_DCLICK,
 
+ wxEVT_SET_CURSOR,
+
 /* Character input event type  */
  wxEVT_CHAR,
  wxEVT_KEY_DOWN,

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index b3f9e52b3f45a1ac9f11b48113eae983aaf17ed3..fd014225e52cf650c9d0829b6aaa6cdc3576cfd8 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -131,6 +131,9 @@ def EVT_WINDOW_CREATE(win, func):
 def EVT_WINDOW_DESTROY(win, func):
     win.Connect(-1, -1, wxEVT_DESTROY, func)
 
+def EVT_SET_CURSOR(win, func):
+    win.Connect(-1, -1, wxEVT_SET_CURSOR, func)
+
 
 
 def EVT_IDLE(win, func):

diff --git a/wxPython/src/events.i b/wxPython/src/events.i
index 5d2bd07da5272c9765b9f43fd9078791b0889350..cd34979002fbec314b4d1e55519fddf03562ff79 100644 (file)
--- a/wxPython/src/events.i
+++ b/wxPython/src/events.i
@@ -202,6 +202,21 @@ public:
 
 //---------------------------------------------------------------------------
 
+class wxSetCursorEvent : public wxEvent
+{
+public:
+    wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0);
+
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+
+    void SetCursor(const wxCursor& cursor);
+    const wxCursor& GetCursor() const;
+    bool HasCursor() const;
+};
+
+//---------------------------------------------------------------------------
+
 class wxKeyEvent: public wxEvent {
 public:
     wxKeyEvent(int keyEventType);

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 6cdc0f4b7f9e2966269f31ffa8e5c005825ac7b0..59ad1076ada237779e47df499b56fb849fc00776 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -162,9 +162,6 @@ void wxSetCursor(wxCursor& cursor);
 //----------------------------------------------------------------------
 // Miscellaneous functions
 
-wxWindow * wxFindWindowByLabel(const wxString& label, wxWindow *parent=NULL);
-wxWindow * wxFindWindowByName(const wxString& name, wxWindow *parent=NULL);
-
 void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
 wxWindow * wxGetActiveWindow();
 

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 02691bed551d56ac00a350e8e73caf67d4969d67..630252fd01f7e1d2e340a60b7e2edcc03cde0bc2 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -216,9 +216,11 @@ public:
     void DragAcceptFiles(bool accept);
 #endif
     void Enable(bool enable);
-    //bool FakePopupMenu(wxMenu* menu, int x, int y);
+
+    // Find child window by ID or name
     %name(FindWindowById) wxWindow* FindWindow(long id);
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
+
     void Fit();
     wxColour GetBackgroundColour();
     wxBorder GetBorder() const;
@@ -312,6 +314,7 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 
+    void AddChild(wxWindow* child);
     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 
@@ -365,7 +368,8 @@ public:
     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);
-    void SetCursor(const wxCursor& cursor);
+    bool SetCursor(const wxCursor& cursor);
+    wxCursor& GetCursor();
     void SetEventHandler(wxEvtHandler* handler);
     void SetExtraStyle(long exStyle);
     void SetTitle(const wxString& title);
@@ -495,6 +499,27 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #endif
 
 
+// Unfortunatly the names of these new static methods clash with the
+// names wxPython has been using forever for the overloaded
+// wxWindow::FindWindow, so instead of swigging them as statics create
+// standalone functions for them.
+%inline %{
+wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
+    return wxWindow::FindWindowById(id, parent);
+}
+
+wxWindow* wxFindWindowByName( const wxString& name,
+                              const wxWindow *parent = NULL ) {
+     return wxWindow::FindWindowByName(name, parent);
+}
+
+wxWindow* wxFindWindowByLabel( const wxString& label,
+                               const wxWindow *parent = NULL ) {
+    return wxWindow::FindWindowByLabel(label, parent);
+}
+%}
+
+
 //---------------------------------------------------------------------------
 
 class wxPanel : public wxWindow {

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 6614275ff974cb226795b3406557162b36ec40c7..e7bb17b37a8cb185db80469286ffd62c62af5ef3 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,6 +12,7 @@
 
 %module wx
 
+
 %{
 #include "helpers.h"
 %}
@@ -113,7 +114,6 @@ public:
 %}
 
 
-
 //----------------------------------------------------------------------
 // this is used to cleanup after wxWindows when Python shuts down.