Another merge of 2.6 changes

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

diff --git a/wxPython/demo/MediaCtrl.py b/wxPython/demo/MediaCtrl.py
index 30dc03b1fcc69a9bc726d9f68af3b7a5f35e655b..8b2797cf3c5c90f1519cc3b5df31e5b29db8b80e 100644 (file)
--- a/wxPython/demo/MediaCtrl.py
+++ b/wxPython/demo/MediaCtrl.py
@@ -5,6 +5,18 @@ import os
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

+class StaticText(wx.StaticText):
+    """
+    A StaticText that only updates the label if it has changed, to
+    help reduce potential flicker since these controls would be
+    updated very frequently otherwise.
+    """
+    def SetLabel(self, label):
+        if label <> self.GetLabel():
+            wx.StaticText.SetLabel(self, label)
+
+#----------------------------------------------------------------------
+

 class TestPanel(wx.Panel):
     def __init__(self, parent, log):
         self.log = log
 class TestPanel(wx.Panel):
     def __init__(self, parent, log):
         self.log = log


@@ -18,11 +30,14 @@ class TestPanel(wx.Panel):
             self.Destroy()
             raise
 
             self.Destroy()
             raise
 

+        self.Bind(wx.media.EVT_MEDIA_LOADED, self.OnMediaLoaded)
+

         btn1 = wx.Button(self, -1, "Load File")
         self.Bind(wx.EVT_BUTTON, self.OnLoadFile, btn1)
         
         btn2 = wx.Button(self, -1, "Play")
         self.Bind(wx.EVT_BUTTON, self.OnPlay, btn2)
         btn1 = wx.Button(self, -1, "Load File")
         self.Bind(wx.EVT_BUTTON, self.OnLoadFile, btn1)
         
         btn2 = wx.Button(self, -1, "Play")
         self.Bind(wx.EVT_BUTTON, self.OnPlay, btn2)

+        self.playBtn = btn2

         
         btn3 = wx.Button(self, -1, "Pause")
         self.Bind(wx.EVT_BUTTON, self.OnPause, btn3)
         
         btn3 = wx.Button(self, -1, "Pause")
         self.Bind(wx.EVT_BUTTON, self.OnPause, btn3)


@@ -35,9 +50,9 @@ class TestPanel(wx.Panel):
         slider.SetMinSize((150, -1))
         self.Bind(wx.EVT_SLIDER, self.OnSeek, slider)
 
         slider.SetMinSize((150, -1))
         self.Bind(wx.EVT_SLIDER, self.OnSeek, slider)
 

-        self.st_size = wx.StaticText(self, -1, size=(100,-1))
-        self.st_len  = wx.StaticText(self, -1, size=(100,-1))
-        self.st_pos  = wx.StaticText(self, -1, size=(100,-1))
+        self.st_size = StaticText(self, -1, size=(100,-1))
+        self.st_len  = StaticText(self, -1, size=(100,-1))
+        self.st_pos  = StaticText(self, -1, size=(100,-1))

         
         
         # setup the layout
         
         
         # setup the layout


@@ -53,8 +68,8 @@ class TestPanel(wx.Panel):
         sizer.Add(self.st_pos,  (3, 5))
         self.SetSizer(sizer)
 
         sizer.Add(self.st_pos,  (3, 5))
         self.SetSizer(sizer)
 

-        self.DoLoadFile(os.path.abspath("data/testmovie.mpg"))
-        self.mc.Stop()
+        #self.DoLoadFile(os.path.abspath("data/testmovie.mpg"))
+        wx.CallAfter(self.DoLoadFile, os.path.abspath("data/testmovie.mpg"))

 
         self.timer = wx.Timer(self)
         self.Bind(wx.EVT_TIMER, self.OnTimer)
 
         self.timer = wx.Timer(self)
         self.Bind(wx.EVT_TIMER, self.OnTimer)


@@ -73,6 +88,8 @@ class TestPanel(wx.Panel):
 
 
     def DoLoadFile(self, path):
 
 
     def DoLoadFile(self, path):

+        self.playBtn.Disable()
+        noLog = wx.LogNull()

         if not self.mc.Load(path):
             wx.MessageBox("Unable to load %s: Unsupported format?" % path,
                           "ERROR",
         if not self.mc.Load(path):
             wx.MessageBox("Unable to load %s: Unsupported format?" % path,
                           "ERROR",


@@ -80,13 +97,19 @@ class TestPanel(wx.Panel):
         else:
             self.mc.SetBestFittingSize()
             self.GetSizer().Layout()
         else:
             self.mc.SetBestFittingSize()
             self.GetSizer().Layout()

-            self.mc.Play()

             self.slider.SetRange(0, self.mc.Length())
             self.slider.SetRange(0, self.mc.Length())

-        
+
+    def OnMediaLoaded(self, evt):
+        self.playBtn.Enable()

     
     def OnPlay(self, evt):
     
     def OnPlay(self, evt):

-        self.mc.Play()
-    
+        if not self.mc.Play():
+            wx.MessageBox("Unable to Play media : Unsupported format?",
+                          "ERROR",
+                          wx.ICON_ERROR | wx.OK)
+        else:
+            self.slider.SetRange(0, self.mc.Length())
+

     def OnPause(self, evt):
         self.mc.Pause()
     
     def OnPause(self, evt):
         self.mc.Pause()
     


@@ -148,4 +171,3 @@ if __name__ == '__main__':
     import sys,os
     import run
     run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
     import sys,os
     import run
     run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])

-

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index de74e110f0a15653b33a325b5d746896b40459c7..c66fb1319a950a331c1dbe959607085bd7ed0dc3 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -25,6 +25,21 @@ wx.EventLoop is now implemented for wxMac.
 
 
 
 
 
 

+2.6.2.2
+-------
+
+Change the wx.ListCtrl InsertStringItem wrapper to use the form that
+takes an imageIndex, and set the default to -1.  This ensures that on
+wxMSW that if there is an image list but they don't specify an image,
+the native control doesn't use one anyway.
+
+wxMSW: wx.ListCtrl in report mode is now able to support images in
+other columns besides the first one.  Simply pass an image index to
+SetStringItem.
+
+
+
+

 2.6.2.1
 -------
 * 10-Jan-2006
 2.6.2.1
 -------
 * 10-Jan-2006

diff --git a/wxPython/include/wx/wxPython/printfw.h b/wxPython/include/wx/wxPython/printfw.h
index f3234f1534d5ba71c981878df94a91c762404fa4..bfc4d2be7df04ada4930f8d2787e3e7362432012 100644 (file)
--- a/wxPython/include/wx/wxPython/printfw.h
+++ b/wxPython/include/wx/wxPython/printfw.h
@@ -35,7 +35,7 @@ public:
     void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 
     PYPRIVATE;
     void base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
 
     PYPRIVATE;

-    DECLARE_ABSTRACT_CLASS(wxPyPrintout); 
+    DECLARE_ABSTRACT_CLASS(wxPyPrintout)

 };
 
 #endif
 };
 
 #endif

diff --git a/wxPython/include/wx/wxPython/pyclasses.h b/wxPython/include/wx/wxPython/pyclasses.h
index 11d4509376509e0d8bed0e40ea72c83c1411eae9..ea8bc0fe34e1aa011e2510b83f64da04794c3d94 100644 (file)
--- a/wxPython/include/wx/wxPython/pyclasses.h
+++ b/wxPython/include/wx/wxPython/pyclasses.h
@@ -20,7 +20,7 @@
 //---------------------------------------------------------------------------
 
 class wxPySizer : public wxSizer {
 //---------------------------------------------------------------------------
 
 class wxPySizer : public wxSizer {

-    DECLARE_DYNAMIC_CLASS(wxPySizer);
+    DECLARE_DYNAMIC_CLASS(wxPySizer)

 public:
     wxPySizer() : wxSizer() {};
 
 public:
     wxPySizer() : wxSizer() {};
 


@@ -33,7 +33,7 @@ public:
 //---------------------------------------------------------------------------
 
 class wxPyValidator : public wxValidator {
 //---------------------------------------------------------------------------
 
 class wxPyValidator : public wxValidator {

-    DECLARE_DYNAMIC_CLASS(wxPyValidator);
+    DECLARE_DYNAMIC_CLASS(wxPyValidator)

 public:
     wxPyValidator() {
     }
 public:
     wxPyValidator() {
     }

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 199b5fa7efbb7dcc8c788f33aaf79d78a1e31db3..334fdcd323c9c495742e5bf5473fb05f5a6f53f5 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -286,7 +286,7 @@ PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
 #ifndef wxPyUSE_EXPORTED_API
 
 class wxPyCallback : public wxObject {
 #ifndef wxPyUSE_EXPORTED_API
 
 class wxPyCallback : public wxObject {

-    DECLARE_ABSTRACT_CLASS(wxPyCallback);
+    DECLARE_ABSTRACT_CLASS(wxPyCallback)

 public:
     wxPyCallback(PyObject* func);
     wxPyCallback(const wxPyCallback& other);
 public:
     wxPyCallback(PyObject* func);
     wxPyCallback(const wxPyCallback& other);


@@ -606,7 +606,7 @@ enum {
 
 class wxPyApp: public wxApp
 {
 
 class wxPyApp: public wxApp
 {

-    DECLARE_ABSTRACT_CLASS(wxPyApp);
+    DECLARE_ABSTRACT_CLASS(wxPyApp)

 
 public:
     wxPyApp();
 
 public:
     wxPyApp();

diff --git a/wxPython/misc/wxprojview.py b/wxPython/misc/wxprojview.py
new file mode 100755 (executable)
index 0000000..5b002df
--- /dev/null
+++ b/wxPython/misc/wxprojview.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+
+import wx
+import wx.lib.stattext as st
+import os
+
+class MyFrame(wx.Frame):
+    def __init__(self):
+        wx.Frame.__init__(self, None, title="wx Active Project",
+                          style=wx.FRAME_NO_TASKBAR|wx.STAY_ON_TOP,
+                          name="wxprojview"
+                          )
+        p = wx.Panel(self)#, style=wx.SIMPLE_BORDER)
+        
+        p.SetBackgroundColour("sky blue")
+        self.label = st.GenStaticText(p, -1, "wx XXX")
+        self.label.SetBackgroundColour("sky blue")
+        self.label.SetFont(wx.Font(14, wx.SWISS, wx.NORMAL, wx.BOLD))
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self.label, 1, wx.ALIGN_CENTER|wx.ALL, 2)
+        p.SetSizerAndFit(sizer)
+        self.SetClientSize(p.GetSize())
+
+        for obj in [p, self.label]:
+            obj.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
+            obj.Bind(wx.EVT_LEFT_UP,   self.OnLeftUp)
+            obj.Bind(wx.EVT_MOTION,    self.OnMouseMove)
+            obj.Bind(wx.EVT_RIGHT_UP,  self.OnRightUp)
+
+        cfg = wx.Config.Get()
+        cfg.SetPath("/")
+        if cfg.Exists("Pos"):
+            pos = eval(cfg.Read("Pos"))
+            # TODO: ensure this position is on-screen
+            self.SetPosition(pos)
+
+        self.Bind(wx.EVT_CLOSE, self.OnClose)
+        self.Bind(wx.EVT_TIMER, self.OnUpdateVersion)
+        self.timer = wx.Timer(self)
+        self.timer.Start(5000)
+        self.OnUpdateVersion(None)
+
+
+    def OnUpdateVersion(self, evt):
+        ver = '??'
+        if 'wxMSW' in wx.PlatformInfo:
+            pass
+        else:
+            link = '/opt/wx/current'
+            if os.path.islink(link):
+                rp = os.path.realpath(link)
+                ver = os.path.split(rp)[1]
+        label = 'wx %s' % ver
+        if label != self.label.GetLabel():
+            self.label.SetLabel(label)
+            self.label.GetContainingSizer().Layout()
+
+
+    def OnClose(self, evt):
+        cfg = wx.Config.Get()
+        cfg.SetPath("/")
+        cfg.Write("Pos", str(self.GetPosition().Get()))
+        self.timer.Stop()
+        evt.Skip()
+        
+        
+
+    def OnLeftDown(self, evt):
+        win = evt.GetEventObject()
+        win.CaptureMouse()
+        self.capture = win
+        pos = win.ClientToScreen(evt.GetPosition())
+        origin = self.GetPosition()
+        dx = pos.x - origin.x
+        dy = pos.y - origin.y
+        self.delta = wx.Point(dx, dy)
+
+    def OnLeftUp(self, evt):
+        if self.capture.HasCapture():
+            self.capture.ReleaseMouse()
+
+    def OnMouseMove(self, evt):
+        if evt.Dragging() and evt.LeftIsDown():
+            win = evt.GetEventObject()
+            pos = win.ClientToScreen(evt.GetPosition())
+            fp = (pos.x - self.delta.x, pos.y - self.delta.y)
+            self.Move(fp)
+
+    def OnRightUp(self, evt):
+        self.Close()
+
+        
+
+app = wx.PySimpleApp()
+app.SetAppName("wxprojview")
+app.SetVendorName("Robin Dunn")
+frm = MyFrame()
+frm.Show()
+app.MainLoop()

diff --git a/wxPython/src/_colour.i b/wxPython/src/_colour.i
index 630d1069903337c6e8193747e7504a8b3c3b6f55..b69c056343bf8cb5fd523f9089ab1f15422813d7 100644 (file)
--- a/wxPython/src/_colour.i
+++ b/wxPython/src/_colour.i
@@ -23,13 +23,15 @@ Blue (RGB) intensity values, and is used to determine drawing colours,
 window colours, etc.  Valid RGB values are in the range 0 to 255.
 
 In wxPython there are typemaps that will automatically convert from a
 window colours, etc.  Valid RGB values are in the range 0 to 255.
 
 In wxPython there are typemaps that will automatically convert from a

-colour name, or from a '#RRGGBB' colour hex value string to a
-wx.Colour object when calling C++ methods that expect a wxColour.
-This means that the following are all equivallent::
+colour name, from a '#RRGGBB' colour hex value string, or from a 3
+integer tuple to a wx.Colour object when calling C++ methods that
+expect a wxColour.  This means that the following are all
+equivallent::

 
     win.SetBackgroundColour(wxColour(0,0,255))
     win.SetBackgroundColour('BLUE')
     win.SetBackgroundColour('#0000FF')
 
     win.SetBackgroundColour(wxColour(0,0,255))
     win.SetBackgroundColour('BLUE')
     win.SetBackgroundColour('#0000FF')

+    win.SetBackgroundColour((0,0,255))

 
 Additional colour names and their coresponding values can be added
 using `wx.ColourDatabase`.  Various system colours (as set in the
 
 Additional colour names and their coresponding values can be added
 using `wx.ColourDatabase`.  Various system colours (as set in the

diff --git a/wxPython/src/_core_api.i b/wxPython/src/_core_api.i
index 3ca6ae08f11c7bb66fe0334f701e8b22ed7a5951..17f8b0efc56e6cfc4b92a2560849ed73bb97b063 100644 (file)
--- a/wxPython/src/_core_api.i
+++ b/wxPython/src/_core_api.i
@@ -21,7 +21,7 @@
 // in the wrapper code.
 
 #include <wx/hashmap.h>
 // in the wrapper code.
 
 #include <wx/hashmap.h>

-WX_DECLARE_STRING_HASH_MAP( swig_type_info*, wxPyTypeInfoHashMap );
+    WX_DECLARE_STRING_HASH_MAP( swig_type_info*, wxPyTypeInfoHashMap );

 
 
 // Maintains a hashmap of className to swig_type_info pointers.  Given the
 
 
 // Maintains a hashmap of className to swig_type_info pointers.  Given the

diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index 60b2c49c60faedcaf7a9ae6f272162d4fbbbbbd0..32a52cd25c50ecde5e46c39dff03e2edb675b430 100644 (file)
--- a/wxPython/src/_display.i
+++ b/wxPython/src/_display.i
@@ -91,7 +91,7 @@ const wxVideoMode     wxDefaultVideoMode;
 #include <wx/dynarray.h>
 #include <wx/vidmode.h>
 
 #include <wx/dynarray.h>
 #include <wx/vidmode.h>
 

-WX_DECLARE_OBJARRAY(wxVideoMode, wxArrayVideoModes);
+    WX_DECLARE_OBJARRAY(wxVideoMode, wxArrayVideoModes);

 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxArrayVideoModes);
 const wxVideoMode wxDefaultVideoMode;
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxArrayVideoModes);
 const wxVideoMode wxDefaultVideoMode;

diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index 0b88af7a3da1f6f87882df7b1840086b3dde1c2a..01d62edc5e49a84bf930c152dccac7985e82542d 100644 (file)
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -368,7 +368,7 @@ EVT_LIST_ITEM_FOCUSED      = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED
 
 %{  // C++ Version of a Python aware class
 class wxPyListCtrl : public wxListCtrl {
 
 %{  // C++ Version of a Python aware class
 class wxPyListCtrl : public wxListCtrl {

-    DECLARE_ABSTRACT_CLASS(wxPyListCtrl);
+    DECLARE_ABSTRACT_CLASS(wxPyListCtrl)

 public:
     wxPyListCtrl() : wxListCtrl() {}
     wxPyListCtrl(wxWindow* parent, wxWindowID id,
 public:
     wxPyListCtrl() : wxListCtrl() {}
     wxPyListCtrl(wxWindow* parent, wxWindowID id,


@@ -661,13 +661,16 @@ details in the second return value (see wx.LIST_HITTEST flags.)", "");
     long InsertItem(wxListItem& info);
 
     // Insert a string item
     long InsertItem(wxListItem& info);
 
     // Insert a string item

-    %Rename(InsertStringItem,  long, InsertItem(long index, const wxString& label));
+    %Rename(InsertStringItem,
+            long, InsertItem(long index, const wxString& label, int imageIndex=-1));

 
     // Insert an image item
 
     // Insert an image item

-    %Rename(InsertImageItem,  long, InsertItem(long index, int imageIndex));
+    %Rename(InsertImageItem,
+            long, InsertItem(long index, int imageIndex));

 
     // Insert an image/string item
 
     // Insert an image/string item

-    %Rename(InsertImageStringItem,  long, InsertItem(long index, const wxString& label, int imageIndex));
+    %Rename(InsertImageStringItem,
+            long, InsertItem(long index, const wxString& label, int imageIndex));

 
     // For list view mode (only), inserts a column.
     %Rename(InsertColumnItem,  long, InsertColumn(long col, wxListItem& info));
 
     // For list view mode (only), inserts a column.
     %Rename(InsertColumnItem,  long, InsertColumn(long col, wxListItem& info));

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index b4911ce8fda530269ac266a6c3d8725091233c6a..3db79113025fd629dec6897afb5affd20a421747 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -721,7 +721,7 @@ public:
 %{
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 %{
 class wxPyPreviewFrame : public wxPreviewFrame
 {

-    DECLARE_CLASS(wxPyPreviewFrame);
+    DECLARE_CLASS(wxPyPreviewFrame)

 public:
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,
 public:
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,


@@ -780,7 +780,7 @@ public:
 %{
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 %{
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {

-    DECLARE_CLASS(wxPyPreviewControlBar);
+    DECLARE_CLASS(wxPyPreviewControlBar)

 public:
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,
 public:
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index 1b7540f52c1a99cbdf2a75b72d8175b955a085d9..1a5ea7b2285947b969d26f36a9b2d02989734f98 100644 (file)
--- a/wxPython/src/_taskbar.i
+++ b/wxPython/src/_taskbar.i
@@ -61,7 +61,7 @@ enum {
 // Otherwise make a class that can virtualize CreatePopupMenu
 class wxPyTaskBarIcon : public wxTaskBarIcon
 {
 // Otherwise make a class that can virtualize CreatePopupMenu
 class wxPyTaskBarIcon : public wxTaskBarIcon
 {

-    DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon);
+    DECLARE_ABSTRACT_CLASS(wxPyTaskBarIcon)

 public:
     wxPyTaskBarIcon() : wxTaskBarIcon()
     {}
 public:
     wxPyTaskBarIcon() : wxTaskBarIcon()
     {}

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index 77a8647d7c06c443f55db5edbaae73faa384a57e..8c86481e5d29de2e71df42b85480f8755b089ed3 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -263,7 +263,7 @@ public:
 
 %{ // C++ version of Python aware wxTreeCtrl
 class wxPyTreeCtrl : public wxTreeCtrl {
 
 %{ // C++ version of Python aware wxTreeCtrl
 class wxPyTreeCtrl : public wxTreeCtrl {

-    DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl);
+    DECLARE_ABSTRACT_CLASS(wxPyTreeCtrl)

 public:
     wxPyTreeCtrl() : wxTreeCtrl() {}
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,
 public:
     wxPyTreeCtrl() : wxTreeCtrl() {}
     wxPyTreeCtrl(wxWindow *parent, wxWindowID id,

diff --git a/wxPython/src/_vscroll.i b/wxPython/src/_vscroll.i
index e833ef77b6ec79e1676e9f7f03f68631c1a48a83..00f7f71217713cea5a678070f4ad1c98268553d7 100644 (file)
--- a/wxPython/src/_vscroll.i
+++ b/wxPython/src/_vscroll.i
@@ -35,7 +35,7 @@
 %{
 class wxPyVScrolledWindow  : public wxVScrolledWindow
 {
 %{
 class wxPyVScrolledWindow  : public wxVScrolledWindow
 {

-    DECLARE_ABSTRACT_CLASS(wxPyVScrolledWindow);
+    DECLARE_ABSTRACT_CLASS(wxPyVScrolledWindow)

 public:
     wxPyVScrolledWindow() : wxVScrolledWindow() {}
 
 public:
     wxPyVScrolledWindow() : wxVScrolledWindow() {}
 


@@ -224,7 +224,7 @@ MAKE_CONST_WXSTRING(VListBoxNameStr);
 %{
 class wxPyVListBox  : public wxVListBox
 {
 %{
 class wxPyVListBox  : public wxVListBox
 {

-    DECLARE_ABSTRACT_CLASS(wxPyVListBox);
+    DECLARE_ABSTRACT_CLASS(wxPyVListBox)

 public:
     wxPyVListBox() : wxVListBox() {}
 
 public:
     wxPyVListBox() : wxVListBox() {}
 


@@ -463,7 +463,7 @@ public:
 %{
 class wxPyHtmlListBox  : public wxHtmlListBox
 {
 %{
 class wxPyHtmlListBox  : public wxHtmlListBox
 {

-    DECLARE_ABSTRACT_CLASS(wxPyHtmlListBox);
+    DECLARE_ABSTRACT_CLASS(wxPyHtmlListBox)

 public:
     wxPyHtmlListBox() : wxHtmlListBox() {}
 
 public:
     wxPyHtmlListBox() : wxHtmlListBox() {}
 

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 8bccd1305eae97ef7f96f416a51f8157505a2f84..651cfe27677407afa8e8b8cbb0de27b648eb646a 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -245,7 +245,7 @@ public:
 
 %{
 class wxPyHtmlTagHandler : public wxHtmlTagHandler {
 
 %{
 class wxPyHtmlTagHandler : public wxHtmlTagHandler {

-    DECLARE_DYNAMIC_CLASS(wxPyHtmlTagHandler);
+    DECLARE_DYNAMIC_CLASS(wxPyHtmlTagHandler)

 public:
     wxPyHtmlTagHandler() : wxHtmlTagHandler() {};
 
 public:
     wxPyHtmlTagHandler() : wxHtmlTagHandler() {};
 


@@ -283,7 +283,7 @@ public:
 
 %{
 class wxPyHtmlWinTagHandler : public wxHtmlWinTagHandler {
 
 %{
 class wxPyHtmlWinTagHandler : public wxHtmlWinTagHandler {

-    DECLARE_DYNAMIC_CLASS(wxPyHtmlWinTagHandler);
+    DECLARE_DYNAMIC_CLASS(wxPyHtmlWinTagHandler)

 public:
     wxPyHtmlWinTagHandler() : wxHtmlWinTagHandler() {};
 
 public:
     wxPyHtmlWinTagHandler() : wxHtmlWinTagHandler() {};
 


@@ -642,7 +642,7 @@ public:
 
 %{ // here's the C++ version
 class wxPyHtmlFilter : public wxHtmlFilter {
 
 %{ // here's the C++ version
 class wxPyHtmlFilter : public wxHtmlFilter {

-    DECLARE_ABSTRACT_CLASS(wxPyHtmlFilter);
+    DECLARE_ABSTRACT_CLASS(wxPyHtmlFilter)

 public:
     wxPyHtmlFilter() : wxHtmlFilter() {}
 
 public:
     wxPyHtmlFilter() : wxHtmlFilter() {}
 


@@ -710,7 +710,7 @@ public:
 
 %{
 class wxPyHtmlWindow : public wxHtmlWindow {
 
 %{
 class wxPyHtmlWindow : public wxHtmlWindow {

-    DECLARE_ABSTRACT_CLASS(wxPyHtmlWindow);
+    DECLARE_ABSTRACT_CLASS(wxPyHtmlWindow)

 public:
     wxPyHtmlWindow(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,
 public:
     wxPyHtmlWindow(wxWindow *parent, wxWindowID id = -1,
                    const wxPoint& pos = wxDefaultPosition,

diff --git a/wxPython/src/wizard.i b/wxPython/src/wizard.i
index e2add09da95280f19542a020307a0d9dafa51b98..051102f644777b140035c75a1fb4c99f417d0f52 100644 (file)
--- a/wxPython/src/wizard.i
+++ b/wxPython/src/wizard.i
@@ -126,7 +126,7 @@ public:
 
 %{  // C++ Version of a Python aware class
 class wxPyWizardPage : public wxWizardPage {
 
 %{  // C++ Version of a Python aware class
 class wxPyWizardPage : public wxWizardPage {

-    DECLARE_ABSTRACT_CLASS(wxPyWizardPage);
+    DECLARE_ABSTRACT_CLASS(wxPyWizardPage)

 public:
     wxPyWizardPage() : wxWizardPage() {}
     wxPyWizardPage(wxWizard *parent,
 public:
     wxPyWizardPage() : wxWizardPage() {}
     wxPyWizardPage(wxWizard *parent,

diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py
index 7f198175472734a279226436b5dd1c4d8435ed89..6339ead1fd8e20b93a86470226899d438cfa668e 100644 (file)
--- a/wxPython/wx/lib/buttons.py
+++ b/wxPython/wx/lib/buttons.py
@@ -529,10 +529,10 @@ class __ToggleMixin:
         if not self.IsEnabled() or not self.HasCapture():
             return
         if self.HasCapture():
         if not self.IsEnabled() or not self.HasCapture():
             return
         if self.HasCapture():

-            if self.up != self.saveUp:
-                self.Notify()

             self.ReleaseMouse()
             self.Refresh()
             self.ReleaseMouse()
             self.Refresh()

+            if self.up != self.saveUp:
+                self.Notify()

 
     def OnKeyDown(self, event):
         event.Skip()
 
     def OnKeyDown(self, event):
         event.Skip()

diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py
index cd78c8c907e7f862b09338dc695d5616b93b9cf3..dc161d603b04898d938536d0e5b336d26f4568ad 100644 (file)
--- a/wxPython/wx/py/crust.py
+++ b/wxPython/wx/py/crust.py
@@ -279,6 +279,10 @@ class CrustFrame(frame.Frame, frame.ShellFrameMixin):
         dialog.Destroy()
 
 
         dialog.Destroy()
 
 

+    def OnHelp(self, event):
+        """Show a help dialog."""
+        frame.ShellFrameMixin.OnHelp(self, event)
+

 
     def LoadSettings(self):
         if self.config is not None:
 
     def LoadSettings(self):
         if self.config is not None:

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index 4fd61f963e07e7e058900ba7e647c78fd3e20754..a0cdcf88a240fb1f4a845b3d14b27baced3b003e 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -95,6 +95,11 @@ class ShellFrame(frame.Frame, frame.ShellFrameMixin):
         dialog.Destroy()
 
 
         dialog.Destroy()
 
 

+    def OnHelp(self, event):
+        """Show a help dialog."""
+        frame.ShellFrameMixin.OnHelp(self, event)
+
+

     def LoadSettings(self):
         if self.config is not None:
             frame.ShellFrameMixin.LoadSettings(self)
     def LoadSettings(self):
         if self.config is not None:
             frame.ShellFrameMixin.LoadSettings(self)

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index 980c02a6c2c3982b205465014159032b458500c3..b65718f6a89362d6c1a65634b3ff313d5d2071e0 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -1073,6 +1073,8 @@ wxEventLoop = wx._core.EventLoop
 wxEventLoopPtr = wx._core.EventLoopPtr
 wxEventLoop_GetActive = wx._core.EventLoop_GetActive
 wxEventLoop_SetActive = wx._core.EventLoop_SetActive
 wxEventLoopPtr = wx._core.EventLoopPtr
 wxEventLoop_GetActive = wx._core.EventLoop_GetActive
 wxEventLoop_SetActive = wx._core.EventLoop_SetActive

+wxEventLoopActivator = wx._core.EventLoopActivator
+wxEventLoopActivatorPtr = wx._core.EventLoopActivatorPtr

 wxAcceleratorEntry = wx._core.AcceleratorEntry
 wxAcceleratorEntryPtr = wx._core.AcceleratorEntryPtr
 wxAcceleratorTable = wx._core.AcceleratorTable
 wxAcceleratorEntry = wx._core.AcceleratorEntry
 wxAcceleratorEntryPtr = wx._core.AcceleratorEntryPtr
 wxAcceleratorTable = wx._core.AcceleratorTable

diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py
index 4a4956cd096150b590f48b4a1e7083744c11313b..562f637b824f837f9439346032768a59640f47c3 100644 (file)
--- a/wxPython/wxPython/html.py
+++ b/wxPython/wxPython/html.py
@@ -127,18 +127,64 @@ wxHtmlSearchStatus = wx.html.HtmlSearchStatus
 wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr
 wxHtmlHelpData = wx.html.HtmlHelpData
 wxHtmlHelpDataPtr = wx.html.HtmlHelpDataPtr
 wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr
 wxHtmlHelpData = wx.html.HtmlHelpData
 wxHtmlHelpDataPtr = wx.html.HtmlHelpDataPtr

-wxHtmlHelpFrame = wx.html.HtmlHelpFrame
-wxHtmlHelpFramePtr = wx.html.HtmlHelpFramePtr

 wxHF_TOOLBAR = wx.html.HF_TOOLBAR
 wxHF_TOOLBAR = wx.html.HF_TOOLBAR

-wxHF_FLATTOOLBAR = wx.html.HF_FLATTOOLBAR

 wxHF_CONTENTS = wx.html.HF_CONTENTS
 wxHF_INDEX = wx.html.HF_INDEX
 wxHF_SEARCH = wx.html.HF_SEARCH
 wxHF_BOOKMARKS = wx.html.HF_BOOKMARKS
 wxHF_CONTENTS = wx.html.HF_CONTENTS
 wxHF_INDEX = wx.html.HF_INDEX
 wxHF_SEARCH = wx.html.HF_SEARCH
 wxHF_BOOKMARKS = wx.html.HF_BOOKMARKS

-wxHF_OPENFILES = wx.html.HF_OPENFILES
+wxHF_OPEN_FILES = wx.html.HF_OPEN_FILES

 wxHF_PRINT = wx.html.HF_PRINT
 wxHF_PRINT = wx.html.HF_PRINT

-wxHF_DEFAULTSTYLE = wx.html.HF_DEFAULTSTYLE
+wxHF_FLAT_TOOLBAR = wx.html.HF_FLAT_TOOLBAR
+wxHF_MERGE_BOOKS = wx.html.HF_MERGE_BOOKS
+wxHF_ICONS_BOOK = wx.html.HF_ICONS_BOOK
+wxHF_ICONS_BOOK_CHAPTER = wx.html.HF_ICONS_BOOK_CHAPTER
+wxHF_ICONS_FOLDER = wx.html.HF_ICONS_FOLDER
+wxHF_DEFAULT_STYLE = wx.html.HF_DEFAULT_STYLE
+wxHF_EMBEDDED = wx.html.HF_EMBEDDED
+wxHF_DIALOG = wx.html.HF_DIALOG
+wxHF_FRAME = wx.html.HF_FRAME
+wxHF_MODAL = wx.html.HF_MODAL
+wxID_HTML_PANEL = wx.html.ID_HTML_PANEL
+wxID_HTML_BACK = wx.html.ID_HTML_BACK
+wxID_HTML_FORWARD = wx.html.ID_HTML_FORWARD
+wxID_HTML_UPNODE = wx.html.ID_HTML_UPNODE
+wxID_HTML_UP = wx.html.ID_HTML_UP
+wxID_HTML_DOWN = wx.html.ID_HTML_DOWN
+wxID_HTML_PRINT = wx.html.ID_HTML_PRINT
+wxID_HTML_OPENFILE = wx.html.ID_HTML_OPENFILE
+wxID_HTML_OPTIONS = wx.html.ID_HTML_OPTIONS
+wxID_HTML_BOOKMARKSLIST = wx.html.ID_HTML_BOOKMARKSLIST
+wxID_HTML_BOOKMARKSADD = wx.html.ID_HTML_BOOKMARKSADD
+wxID_HTML_BOOKMARKSREMOVE = wx.html.ID_HTML_BOOKMARKSREMOVE
+wxID_HTML_TREECTRL = wx.html.ID_HTML_TREECTRL
+wxID_HTML_INDEXPAGE = wx.html.ID_HTML_INDEXPAGE
+wxID_HTML_INDEXLIST = wx.html.ID_HTML_INDEXLIST
+wxID_HTML_INDEXTEXT = wx.html.ID_HTML_INDEXTEXT
+wxID_HTML_INDEXBUTTON = wx.html.ID_HTML_INDEXBUTTON
+wxID_HTML_INDEXBUTTONALL = wx.html.ID_HTML_INDEXBUTTONALL
+wxID_HTML_NOTEBOOK = wx.html.ID_HTML_NOTEBOOK
+wxID_HTML_SEARCHPAGE = wx.html.ID_HTML_SEARCHPAGE
+wxID_HTML_SEARCHTEXT = wx.html.ID_HTML_SEARCHTEXT
+wxID_HTML_SEARCHLIST = wx.html.ID_HTML_SEARCHLIST
+wxID_HTML_SEARCHBUTTON = wx.html.ID_HTML_SEARCHBUTTON
+wxID_HTML_SEARCHCHOICE = wx.html.ID_HTML_SEARCHCHOICE
+wxID_HTML_COUNTINFO = wx.html.ID_HTML_COUNTINFO
+wxHtmlHelpWindow = wx.html.HtmlHelpWindow
+wxHtmlHelpWindowPtr = wx.html.HtmlHelpWindowPtr
+wxPreHtmlHelpWindow = wx.html.PreHtmlHelpWindow
+wxHtmlWindowEvent = wx.html.HtmlWindowEvent
+wxHtmlWindowEventPtr = wx.html.HtmlWindowEventPtr
+wxHtmlHelpFrame = wx.html.HtmlHelpFrame
+wxHtmlHelpFramePtr = wx.html.HtmlHelpFramePtr
+wxPreHtmlHelpFrame = wx.html.PreHtmlHelpFrame
+wxHtmlHelpDialog = wx.html.HtmlHelpDialog
+wxHtmlHelpDialogPtr = wx.html.HtmlHelpDialogPtr
+wxPreHtmlHelpDialog = wx.html.PreHtmlHelpDialog
+wxHelpControllerBase = wx.html.HelpControllerBase
+wxHelpControllerBasePtr = wx.html.HelpControllerBasePtr

 wxHtmlHelpController = wx.html.HtmlHelpController
 wxHtmlHelpControllerPtr = wx.html.HtmlHelpControllerPtr
 wxHtmlHelpController = wx.html.HtmlHelpController
 wxHtmlHelpControllerPtr = wx.html.HtmlHelpControllerPtr

+wxHtmlModalHelp = wx.html.HtmlModalHelp
+wxHtmlModalHelpPtr = wx.html.HtmlModalHelpPtr