fix text scrolling in GTK2 (patch 703988)

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 96ca6cb7b401baba153b9ecafdf21eb5f90c8de5..461262b48eaad8eb8942280d59872125c061fa51 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -49,6 +49,7 @@
 //----------------------------------------------------------------------
 
 %readonly
 //----------------------------------------------------------------------
 
 %readonly

+// See also wxPy_ReinitStockObjects in helpers.cpp

 wxValidator wxDefaultValidator;
 %readwrite
 
 wxValidator wxDefaultValidator;
 %readwrite
 


@@ -323,7 +324,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

-               const wxValidator& val = wxDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                const wxString& name = wxPyCheckBoxNameStr);
     %name(wxPreCheckBox)wxCheckBox();
 
                const wxString& name = wxPyCheckBoxNameStr);
     %name(wxPreCheckBox)wxCheckBox();
 


@@ -331,13 +332,14 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,

-               const wxValidator& val = wxDefaultValidator,
+               const wxValidator& validator = wxDefaultValidator,

                const wxString& name = wxPyCheckBoxNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"
 
     bool GetValue();
                const wxString& name = wxPyCheckBoxNameStr);
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
     %pragma(python) addtomethod = "wxPreCheckBox:val._setOORInfo(val)"
 
     bool GetValue();

+    bool IsChecked();

     void SetValue(const bool state);
 };
 
     void SetValue(const bool state);
 };
 


@@ -380,11 +382,11 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or
-// even wxControlWithItems, so we have to duplicate the methods
-// here... <blech!>
+// wxGTK's wxComboBox doesn't derive from wxChoice like wxMSW, or even
+// wxControlWithItems, so we have to duplicate the methods here... <blech!>
+// wxMac's inheritace is weird too so we'll fake it with this one too.

 
 

-#ifdef __WXGTK__
+#ifndef __WXMSW__

 class wxComboBox : public wxControl
 {
 public:
 class wxComboBox : public wxControl
 {
 public:


@@ -456,7 +458,11 @@ public:
         }
 
         PyObject* GetClientData(int n) {
         }
 
         PyObject* GetClientData(int n) {

+#ifdef __WXMAC__
+            wxPyClientData* data = (wxPyClientData*)self->wxItemContainer::GetClientObject(n);
+#else

             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);

+#endif

             if (data) {
                 Py_INCREF(data->m_obj);
                 return data->m_obj;
             if (data) {
                 Py_INCREF(data->m_obj);
                 return data->m_obj;


@@ -468,7 +474,11 @@ public:
 
         void SetClientData(int n, PyObject* clientData) {
             wxPyClientData* data = new wxPyClientData(clientData);
 
         void SetClientData(int n, PyObject* clientData) {
             wxPyClientData* data = new wxPyClientData(clientData);

+#ifdef __WXMAC__
+            self->wxItemContainer::SetClientObject(n, data);
+#else

             self->SetClientObject(n, data);
             self->SetClientObject(n, data);

+#endif

         }
     }
 
         }
     }
 


@@ -476,8 +486,8 @@ public:
 
 
 
 
 
 

-#else  // For all but wxGTK
-
+#else
+// MSW's version derives from wxChoice

 
 class wxComboBox : public wxChoice {
 public:
 
 class wxComboBox : public wxChoice {
 public:


@@ -718,6 +728,56 @@ public:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+enum {
+    // Styles
+    wxTE_NO_VSCROLL,
+    wxTE_AUTO_SCROLL,
+    wxTE_READONLY,
+    wxTE_MULTILINE,
+    wxTE_PROCESS_TAB,
+    wxTE_LEFT,
+    wxTE_CENTER,
+    wxTE_RIGHT,
+    wxTE_CENTRE,
+    wxTE_RICH,
+    wxTE_PROCESS_ENTER,
+    wxTE_PASSWORD,
+    wxTE_AUTO_URL,
+    wxTE_NOHIDESEL,
+    wxTE_DONTWRAP,
+    wxTE_LINEWRAP,
+    wxTE_WORDWRAP,
+    wxTE_RICH2,
+
+    // Flags to indicate which attributes are being applied
+    wxTEXT_ATTR_TEXT_COLOUR,
+    wxTEXT_ATTR_BACKGROUND_COLOUR,
+    wxTEXT_ATTR_FONT_FACE,
+    wxTEXT_ATTR_FONT_SIZE,
+    wxTEXT_ATTR_FONT_WEIGHT,
+    wxTEXT_ATTR_FONT_ITALIC,
+    wxTEXT_ATTR_FONT_UNDERLINE,
+    wxTEXT_ATTR_FONT,
+    wxTEXT_ATTR_ALIGNMENT,
+    wxTEXT_ATTR_LEFT_INDENT,
+    wxTEXT_ATTR_RIGHT_INDENT,
+    wxTEXT_ATTR_TABS,
+
+};
+
+
+enum wxTextAttrAlignment
+{
+    wxTEXT_ALIGNMENT_DEFAULT,
+    wxTEXT_ALIGNMENT_LEFT,
+    wxTEXT_ALIGNMENT_CENTRE,
+    wxTEXT_ALIGNMENT_CENTER,
+    wxTEXT_ALIGNMENT_RIGHT,
+    wxTEXT_ALIGNMENT_JUSTIFIED
+};
+
+
+

 
 class wxTextAttr
 {
 
 class wxTextAttr
 {


@@ -725,22 +785,41 @@ public:
     // ctors
     wxTextAttr(const wxColour& colText = wxNullColour,
                const wxColour& colBack = wxNullColour,
     // ctors
     wxTextAttr(const wxColour& colText = wxNullColour,
                const wxColour& colBack = wxNullColour,

-               const wxFont& font = wxNullFont);
+               const wxFont& font = wxNullFont,
+               wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT);

     ~wxTextAttr();
 
     ~wxTextAttr();
 

+    void Init();
+

     // setters
     void SetTextColour(const wxColour& colText);
     void SetBackgroundColour(const wxColour& colBack);
     void SetFont(const wxFont& font);
     // setters
     void SetTextColour(const wxColour& colText);
     void SetBackgroundColour(const wxColour& colBack);
     void SetFont(const wxFont& font);

+    void SetAlignment(wxTextAttrAlignment alignment);
+    void SetTabs(const wxArrayInt& tabs);
+    void SetLeftIndent(int indent);
+    void SetRightIndent(int indent);
+    void SetFlags(long flags);

 
     // accessors
     bool HasTextColour() const;
     bool HasBackgroundColour() const;
     bool HasFont() const;
 
     // accessors
     bool HasTextColour() const;
     bool HasBackgroundColour() const;
     bool HasFont() const;

+    bool HasAlignment() const;
+    bool HasTabs() const;
+    bool HasLeftIndent() const;
+    bool HasRightIndent() const;
+    bool HasFlag(long flag) const;

 
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;
 
     wxColour GetTextColour() const;
     wxColour GetBackgroundColour() const;
     wxFont GetFont() const;

+    wxTextAttrAlignment GetAlignment();
+    const wxArrayInt& GetTabs() const;
+    long GetLeftIndent() const;
+    long GetRightIndent() const;
+    long GetFlags() const;
+

 
     // returns false if we have any attributes set, true otherwise
     bool IsDefault();
 
     // returns false if we have any attributes set, true otherwise
     bool IsDefault();


@@ -824,6 +903,7 @@ public:
     bool SetStyle(long start, long end, const wxTextAttr& style);
     bool SetDefaultStyle(const wxTextAttr& style);
     const wxTextAttr& GetDefaultStyle() const;
     bool SetStyle(long start, long end, const wxTextAttr& style);
     bool SetDefaultStyle(const wxTextAttr& style);
     const wxTextAttr& GetDefaultStyle() const;

+    bool GetStyle(long position, wxTextAttr& style);

 
     // translate between the position (which is just an index in the text ctrl
     // considering all its contents as a single strings) and (x, y) coordinates
 
     // translate between the position (which is just an index in the text ctrl
     // considering all its contents as a single strings) and (x, y) coordinates


@@ -1003,18 +1083,15 @@ public:
     int FindString(const wxString& string);
 
     wxString GetString(int n);
     int FindString(const wxString& string);
 
     wxString GetString(int n);

-
-#ifdef __WXGTK__
-    %name(GetItemLabel)wxString GetLabel( int item );
-    %name(SetItemLabel)void SetLabel( int item, const wxString& label );
-#else

     void SetString(int n, const wxString& label);
     %pragma(python) addtoclass = "
     GetItemLabel = GetString
     SetItemLabel = SetString
     "
     void SetString(int n, const wxString& label);
     %pragma(python) addtoclass = "
     GetItemLabel = GetString
     SetItemLabel = SetString
     "

+#ifndef __WXGTK__

     int GetColumnCount();
     int GetRowCount();
     int GetColumnCount();
     int GetRowCount();

+    int GetNextItem(int item, wxDirection dir, long style);

 #endif
 
     int GetSelection();
 #endif
 
     int GetSelection();


@@ -1133,7 +1210,14 @@ public:
     int GetValue();
     void SetRange(int min, int max);
     void SetValue(int value);
     int GetValue();
     void SetRange(int min, int max);
     void SetValue(int value);

-
+#ifdef __WXGTK__
+    %addmethods {
+        void SetSelection(long from, long to) {
+        }
+    }
+#else
+    void SetSelection(long from, long to);
+#endif

 };
 
 
 };