Fix printing?

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

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 460f5fda47efec8f07d18b83a886ee55b2db9517..f6818657411dc08e56605b4f015f87a0c3edde18 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -24,8 +24,8 @@ MAKE_CONST_WXSTRING(ControlNameStr);
 DocStr(wxControl,
 "This is the base class for a control or 'widget'.
 
 DocStr(wxControl,
 "This is the base class for a control or 'widget'.
 

-A control is generally a small window which processes user input and/or
-displays one or more item of data.");
+A control is generally a small window which processes user input
+and/or displays one or more item of data.", "");

 
 class wxControl : public wxWindow
 {
 
 class wxControl : public wxWindow
 {


@@ -41,12 +41,12 @@ public:
               long style=0,
               const wxValidator& validator=wxDefaultValidator,
                   const wxString& name=wxPyControlNameStr),
               long style=0,
               const wxValidator& validator=wxDefaultValidator,
                   const wxString& name=wxPyControlNameStr),

-        "Create a Control.  Normally you should only call this from a\n"
-        "subclass' __init__ as a plain old wx.Control is not very useful.");
+        "Create a Control.  Normally you should only call this from a subclass'
+__init__ as a plain old wx.Control is not very useful.", "");

 
     DocCtorStrName(
         wxControl(),
 
     DocCtorStrName(
         wxControl(),

-        "Precreate a Control control for 2-phase creation",
+        "Precreate a Control control for 2-phase creation", "",

         PreControl);
 
     DocDeclStr(
         PreControl);
 
     DocDeclStr(


@@ -57,21 +57,27 @@ public:
                       long style=0,
                       const wxValidator& validator=wxDefaultValidator,
                       const wxString& name=wxPyControlNameStr),
                       long style=0,
                       const wxValidator& validator=wxDefaultValidator,
                       const wxString& name=wxPyControlNameStr),

-        "Do the 2nd phase and create the GUI control.");
+        "Do the 2nd phase and create the GUI control.", "");

     
 
     DocDeclStr(
         void , Command(wxCommandEvent& event),
     
 
     DocDeclStr(
         void , Command(wxCommandEvent& event),

-        "Simulates the effect of the user issuing a command to the\n"
-        "item. See wxCommandEvent.");
+        "Simulates the effect of the user issuing a command to the item.
+
+:see: `wx.CommandEvent`
+", "");

    
     DocDeclStr(
         wxString , GetLabel(),
    
     DocDeclStr(
         wxString , GetLabel(),

-        "Return a control's text.");
+        "Return a control's text.", "");

     
     DocDeclStr(
         void , SetLabel(const wxString& label),
     
     DocDeclStr(
         void , SetLabel(const wxString& label),

-        "Sets the item's text.");
+        "Sets the item's text.", "");
+
+    
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 
 };
 
 


@@ -81,18 +87,18 @@ public:
 
 DocStr(wxItemContainer,
 "wx.ItemContainer defines an interface which is implemented by all
 
 DocStr(wxItemContainer,
 "wx.ItemContainer defines an interface which is implemented by all

-controls which have string subitems, each of which may be
-selected, such as wx.ListBox, wx.CheckListBox, wx.Choice and
-wx.ComboBox (which implements an extended interface deriving from
-this one)
+controls which have string subitems, each of which may be selected,
+such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well as
+`wx.ComboBox` which implements an extended interface deriving from
+this one.

 
 

-It defines the methods for accessing the control's items and
-although each of the derived classes implements them differently,
-they still all conform to the same interface.
+It defines the methods for accessing the control's items and although
+each of the derived classes implements them differently, they still
+all conform to the same interface.

 
 

-The items in a wx.ItemContainer have (non empty) string labels
-and, optionally, client data associated with them.
-");
+The items in a wx.ItemContainer have (non empty) string labels and,
+optionally, client data associated with them.
+", "");

 
 class wxItemContainer
 {
 
 class wxItemContainer
 {


@@ -102,10 +108,10 @@ public:
 
     %extend {
         DocStr(Append,
 
     %extend {
         DocStr(Append,

-               "Adds the item to the control, associating the given data with the\n"
-               "item if not None.  The return value is the index of the newly\n"
-               "added item which may be different from the last one if the\n"
-               "control is sorted (e.g. has wx.LB_SORT or wx.CB_SORT style).");
+               "Adds the item to the control, associating the given data with the item
+if not None.  The return value is the index of the newly added item
+which may be different from the last one if the control is sorted (e.g.
+has wx.LB_SORT or wx.CB_SORT style).", "");

         int Append(const wxString& item, PyObject* clientData=NULL) {
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
         int Append(const wxString& item, PyObject* clientData=NULL) {
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);


@@ -117,16 +123,16 @@ public:
     
     DocDeclStrName(
         void , Append(const wxArrayString& strings),
     
     DocDeclStrName(
         void , Append(const wxArrayString& strings),

-        "Apend several items at once to the control.  Notice that calling\n"
-        "this method may be much faster than appending the items one by\n"
-        "one if you need to add a lot of items.",
+        "Apend several items at once to the control.  Notice that calling this
+method may be much faster than appending the items one by one if you
+need to add a lot of items.", "",

         AppendItems);
 
     
     %extend {
         DocStr(Insert,
         AppendItems);
 
     
     %extend {
         DocStr(Insert,

-               "Insert an item into the control before the item at the pos index,\n"
-               "optionally associating some data object with the item.");
+               "Insert an item into the control before the item at the ``pos`` index,
+optionally associating some data object with the item.", "");

         int Insert(const wxString& item, int pos, PyObject* clientData=NULL) {
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
         int Insert(const wxString& item, int pos, PyObject* clientData=NULL) {
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);


@@ -139,65 +145,67 @@ public:
     
     DocDeclStr(
         virtual void , Clear(),
     
     DocDeclStr(
         virtual void , Clear(),

-        "Removes all items from the control.");
+        "Removes all items from the control.", "");

     
     DocDeclStr(
         virtual void , Delete(int n),
     
     DocDeclStr(
         virtual void , Delete(int n),

-        "Deletes the item at the zero-based index 'n' from the control.\n"
-        "Note that it is an error (signalled by a PyAssertionError\n"
-        "exception if enabled) to remove an item with the index negative\n"
-        "or greater or equal than the number of items in the control.");
+        "Deletes the item at the zero-based index 'n' from the control. Note
+that it is an error (signalled by a `wx.PyAssertionError` exception if
+enabled) to remove an item with the index negative or greater or equal
+than the number of items in the control.", "");

     
 
 
     DocDeclStr(
         virtual int , GetCount() const,
     
 
 
     DocDeclStr(
         virtual int , GetCount() const,

-        "Returns the number of items in the control.");
+        "Returns the number of items in the control.", "");

     
     DocDeclStr(
         bool , IsEmpty() const,
     
     DocDeclStr(
         bool , IsEmpty() const,

-        "Returns True if the control is empty or False if it has some items.");
+        "Returns True if the control is empty or False if it has some items.", "");

     
     DocDeclStr(
         virtual wxString , GetString(int n) const,
     
     DocDeclStr(
         virtual wxString , GetString(int n) const,

-        "Returns the label of the item with the given index.");
+        "Returns the label of the item with the given index.", "");

     
     DocDeclStr(
         wxArrayString , GetStrings() const,
     
     DocDeclStr(
         wxArrayString , GetStrings() const,

-        "");
+        "", "");

     
     DocDeclStr(
         virtual void , SetString(int n, const wxString& s),
     
     DocDeclStr(
         virtual void , SetString(int n, const wxString& s),

-        "Sets the label for the given item.");
+        "Sets the label for the given item.", "");

     
     DocDeclStr(
         virtual int , FindString(const wxString& s) const,
     
     DocDeclStr(
         virtual int , FindString(const wxString& s) const,

-        "Finds an item whose label matches the given string.  Returns the\n"
-        "zero-based position of the item, or wx.NOT_FOUND if the string\n"
-        "was not found.");
+        "Finds an item whose label matches the given string.  Returns the
+zero-based position of the item, or ``wx.NOT_FOUND`` if the string was not
+found.", "");

     
 
     
     DocDeclStr(
         virtual void , Select(int n),
     
 
     
     DocDeclStr(
         virtual void , Select(int n),

-        "Sets the item at index 'n' to be the selected item.");
+        "Sets the item at index 'n' to be the selected item.", "");

 
     %pythoncode { SetSelection = Select }
     
     DocDeclStr(
         virtual int , GetSelection() const,
 
     %pythoncode { SetSelection = Select }
     
     DocDeclStr(
         virtual int , GetSelection() const,

-        "Returns the index of the selected item or wx.NOT_FOUND if no item is selected.");
+        "Returns the index of the selected item or ``wx.NOT_FOUND`` if no item
+is selected.", "");

     
 
     DocDeclStr(
         wxString , GetStringSelection() const,
     
 
     DocDeclStr(
         wxString , GetStringSelection() const,

-        "Returns the label of the selected item or an empty string if no item is selected.");
+        "Returns the label of the selected item or an empty string if no item
+is selected.", "");

     
 
 
     %extend {
         DocStr(GetClientData,
     
 
 
     %extend {
         DocStr(GetClientData,

-               "Returns the client data associated with the given item, (if any.)");
+               "Returns the client data associated with the given item, (if any.)", "");

         PyObject* GetClientData(int n) {
             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             if (data) {
         PyObject* GetClientData(int n) {
             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             if (data) {


@@ -210,7 +218,7 @@ public:
         }
 
         DocStr(SetClientData,
         }
 
         DocStr(SetClientData,

-               "Associate the given client data with the item at position n.");
+               "Associate the given client data with the item at position n.", "");

         void SetClientData(int n, PyObject* clientData) {
             wxPyClientData* data = new wxPyClientData(clientData);
             self->SetClientObject(n, data);
         void SetClientData(int n, PyObject* clientData) {
             wxPyClientData* data = new wxPyClientData(clientData);
             self->SetClientObject(n, data);


@@ -224,9 +232,9 @@ public:
 %newgroup;
 
 DocStr(wxControlWithItems,
 %newgroup;
 
 DocStr(wxControlWithItems,

-"wx.ControlWithItems combines the wx.ItemContainer class with the
-wx.Control class, and is used for the base class of various
-controls that have items.");
+"wx.ControlWithItems combines the ``wx.ItemContainer`` class with the
+wx.Control class, and is used for the base class of various controls
+that have items.", "");

 
 class wxControlWithItems : public wxControl, public wxItemContainer
 {
 
 class wxControlWithItems : public wxControl, public wxItemContainer
 {