Premultiply the alpha on wxMSW in the BitmapFromBuffer* functions so

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

diff --git a/wxPython/src/_accel.i b/wxPython/src/_accel.i
index 40eade94d61673a6e06d423dea95b9774559dd4d..334cf13c5609dd7a6346c834c5bdae412a7f581a 100644 (file)
--- a/wxPython/src/_accel.i
+++ b/wxPython/src/_accel.i
@@ -36,19 +36,19 @@ programs can choose to use wx.AcceleratorEntry objects, but using a
 list of 3-tuple of integers (flags, keyCode, cmdID) usually works just
 as well.  See `__init__` for details of the tuple values.
 
 list of 3-tuple of integers (flags, keyCode, cmdID) usually works just
 as well.  See `__init__` for details of the tuple values.
 

-:see: `wx.AcceleratorTable`");
+:see: `wx.AcceleratorTable`", "");

 
 class wxAcceleratorEntry {
 public:
     DocCtorStr(
         wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmdID = 0/*, wxMenuItem *menuitem = NULL*/),
 
 class wxAcceleratorEntry {
 public:
     DocCtorStr(
         wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmdID = 0/*, wxMenuItem *menuitem = NULL*/),

-        "Construct a wx.AcceleratorEntry.
-
-  :param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT,
+        "Construct a wx.AcceleratorEntry.",
+        "
+    :param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT,

                 wx.ACCEL_CTRL or wx.ACCEL_NORMAL used to specify
                 which modifier keys are held down.
                 wx.ACCEL_CTRL or wx.ACCEL_NORMAL used to specify
                 which modifier keys are held down.

-  :param keyCode: The keycode to be detected
-  :param cmdID: The menu or control command ID to use for the
+    :param keyCode: The keycode to be detected
+    :param cmdID: The menu or control command ID to use for the

                 accellerator event.
 ");
     ~wxAcceleratorEntry();
                 accellerator event.
 ");
     ~wxAcceleratorEntry();


@@ -56,7 +56,7 @@ public:
     DocDeclStr(
         void , Set(int flags, int keyCode, int cmd/*, wxMenuItem *menuItem = NULL*/),
         "(Re)set the attributes of a wx.AcceleratorEntry.
     DocDeclStr(
         void , Set(int flags, int keyCode, int cmd/*, wxMenuItem *menuItem = NULL*/),
         "(Re)set the attributes of a wx.AcceleratorEntry.

-:see `__init__`");
+:see `__init__`", "");

     
 
 //     void SetMenuItem(wxMenuItem *item);
     
 
 //     void SetMenuItem(wxMenuItem *item);


@@ -64,15 +64,15 @@ public:
 
     DocDeclStr(
         int , GetFlags(),
 
     DocDeclStr(
         int , GetFlags(),

-        "Get the AcceleratorEntry's flags.");
+        "Get the AcceleratorEntry's flags.", "");

     
     DocDeclStr(
         int , GetKeyCode(),
     
     DocDeclStr(
         int , GetKeyCode(),

-        "Get the AcceleratorEntry's keycode.");
+        "Get the AcceleratorEntry's keycode.", "");

     
     DocDeclStr(
         int , GetCommand(),
     
     DocDeclStr(
         int , GetCommand(),

-        "Get the AcceleratorEntry's command ID.");
+        "Get the AcceleratorEntry's command ID.", "");

 };
 
 
 };
 
 


@@ -83,7 +83,7 @@ DocStr(wxAcceleratorTable,
 "An accelerator table allows the application to specify a table of
 keyboard shortcuts for menus or other commands. On Windows, menu or
 button commands are supported; on GTK, only menu commands are
 "An accelerator table allows the application to specify a table of
 keyboard shortcuts for menus or other commands. On Windows, menu or
 button commands are supported; on GTK, only menu commands are

-supported.
+supported.", "

 
 The object ``wx.NullAcceleratorTable`` is defined to be a table with
 no data, and is the initial accelerator table for a window.
 
 The object ``wx.NullAcceleratorTable`` is defined to be a table with
 no data, and is the initial accelerator table for a window.


@@ -113,7 +113,7 @@ public:
             "Construct an AcceleratorTable from a list of `wx.AcceleratorEntry`
 items or or of 3-tuples (flags, keyCode, cmdID)
 
             "Construct an AcceleratorTable from a list of `wx.AcceleratorEntry`
 items or or of 3-tuples (flags, keyCode, cmdID)
 

-:see: `wx.AcceleratorEntry`");
+:see: `wx.AcceleratorEntry`", "");

     wxAcceleratorTable(int n, const wxAcceleratorEntry* entries);
     ~wxAcceleratorTable();
 
     wxAcceleratorTable(int n, const wxAcceleratorEntry* entries);
     ~wxAcceleratorTable();
 


@@ -123,7 +123,6 @@ items or or of 3-tuples (flags, keyCode, cmdID)
 
  
 %immutable;
 
  
 %immutable;

-// See also wxPy_ReinitStockObjects in helpers.cpp

 const wxAcceleratorTable wxNullAcceleratorTable;
 %mutable;
 
 const wxAcceleratorTable wxNullAcceleratorTable;
 %mutable;