fix text scrolling in GTK2 (patch 703988)

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

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index c75d8aeaab049b1a5017b659f260b185d48fa167..41c469a0386dae767fbe05322d10915caab6c2ea 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -33,8 +33,12 @@
 %pragma(python) code = "import wx"
 
 
 %pragma(python) code = "import wx"
 
 

+//----------------------------------------------------------------------
+

 %{
 %{

-    static wxString wxPyEmptyStr("");
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(PanelNameStr);
+    static const wxString wxPyEmptyString(wxT(""));

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------


@@ -63,6 +67,14 @@ public:
                           (wxObjectEventFunction) &wxPyCallback::EventThunker,
                           new wxPyCallback(func));
             }
                           (wxObjectEventFunction) &wxPyCallback::EventThunker,
                           new wxPyCallback(func));
             }

+            else if (func == Py_None) {
+                self->Disconnect(id, lastId, eventType,
+                                 (wxObjectEventFunction)
+                                 &wxPyCallback::EventThunker);
+            }
+            else {
+                PyErr_SetString(PyExc_TypeError, "Expected callable object or None.");
+            }

         }
 
         bool Disconnect(int id, int lastId = -1,
         }
 
         bool Disconnect(int id, int lastId = -1,


@@ -73,6 +85,11 @@ public:
         }
     }
 
         }
     }
 

+    %addmethods {
+        void _setOORInfo(PyObject* _self) {
+            self->SetClientObject(new wxPyOORClientData(_self));
+        }
+    }

 };
 
 
 };
 
 


@@ -83,6 +100,8 @@ public:
     wxValidator();
     //~wxValidator();
 
     wxValidator();
     //~wxValidator();
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     wxValidator* Clone();
     wxWindow* GetWindow();
     void SetWindow(wxWindow* window);
     wxValidator* Clone();
     wxWindow* GetWindow();
     void SetWindow(wxWindow* window);


@@ -108,7 +127,7 @@ public:
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 
         wxPyValidator* ptr = NULL;
         wxPyValidator* self = (wxPyValidator*)this;
 

-        wxPyTState* state = wxPyBeginBlockThreads();
+        wxPyBeginBlockThreads();

         if (self->m_myInst.findCallback("Clone")) {
             PyObject* ro;
             ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
         if (self->m_myInst.findCallback("Clone")) {
             PyObject* ro;
             ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));


@@ -117,7 +136,7 @@ public:
                 Py_DECREF(ro);
             }
         }
                 Py_DECREF(ro);
             }
         }

-        wxPyEndBlockThreads(state);
+        wxPyEndBlockThreads();

 
         // This is very dangerous!!! But is the only way I could find
         // to squash a memory leak.  Currently it is okay, but if the
 
         // This is very dangerous!!! But is the only way I could find
         // to squash a memory leak.  Currently it is okay, but if the


@@ -147,9 +166,10 @@ class wxPyValidator : public wxValidator {
 public:
     wxPyValidator();
 
 public:
     wxPyValidator();
 

-    void _setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 1)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=TRUE);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyValidator, 1)"

 
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -162,16 +182,19 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,

-             char* name = "panel");
+             const wxString& name = wxPyPanelNameStr);

     %name(wxPreWindow)wxWindow();
 
     bool Create(wxWindow* parent, const wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
     %name(wxPreWindow)wxWindow();
 
     bool Create(wxWindow* parent, const wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,

-                char* name = "panel");
+                const wxString& name = wxPyPanelNameStr);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
+

 
 

-    void CaptureMouse();

     void Center(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );
     void Center(int direction = wxBOTH);
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );


@@ -179,7 +202,7 @@ public:
     void CentreOnScreen(int direction = wxBOTH );
     void CenterOnScreen(int direction = wxBOTH );
 
     void CentreOnScreen(int direction = wxBOTH );
     void CenterOnScreen(int direction = wxBOTH );
 

-    void Clear();
+    void ClearBackground();

 
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
 
     // (uses apply'ed INOUT typemap, see above)
     %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);


@@ -193,10 +216,17 @@ public:
     void DragAcceptFiles(bool accept);
 #endif
     void Enable(bool enable);
     void DragAcceptFiles(bool accept);
 #endif
     void Enable(bool enable);

-    //bool FakePopupMenu(wxMenu* menu, int x, int y);
+    void Disable();
+
+    // Find child window by ID or name

     %name(FindWindowById) wxWindow* FindWindow(long id);
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
     %name(FindWindowById) wxWindow* FindWindow(long id);
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);

+

     void Fit();
     void Fit();

+
+    // set virtual size to satisfy children
+    void FitInside();
+

     wxColour GetBackgroundColour();
 
     //wxList& GetChildren();
     wxColour GetBackgroundColour();
 
     //wxList& GetChildren();


@@ -211,10 +241,19 @@ public:
     int  GetCharWidth();
     %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
     wxSize GetClientSize();
     int  GetCharWidth();
     %name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
     wxSize GetClientSize();

+
+    // get the origin of the client area of the window relative to the
+    // window top left corner (the client area may be shifted because of
+    // the borders, scrollbars, other decorations...)
+    wxPoint GetClientAreaOrigin() const;
+
+    // get the client rectangle in window (i.e. client) coordinates
+    wxRect GetClientRect() const;
+

     wxLayoutConstraints * GetConstraints();
     wxEvtHandler* GetEventHandler();
 
     wxLayoutConstraints * GetConstraints();
     wxEvtHandler* GetEventHandler();
 

-    wxFont& GetFont();
+    wxFont GetFont();

     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();
     %addmethods {
     wxColour GetForegroundColour();
     wxWindow * GetGrandParent();
     %addmethods {


@@ -244,7 +283,9 @@ public:
     long GetWindowStyleFlag();
     void SetWindowStyleFlag(long style);
     void SetWindowStyle(long style);
     long GetWindowStyleFlag();
     void SetWindowStyleFlag(long style);
     void SetWindowStyle(long style);

+    bool HasScrollbar(int orient) const;

     bool Hide();
     bool Hide();

+    wxHitTest HitTest(const wxPoint& pt);

     void InitDialog();
     bool IsEnabled();
     bool IsExposed( int x, int y, int w=0, int h=0 );
     void InitDialog();
     bool IsEnabled();
     bool IsExposed( int x, int y, int w=0, int h=0 );


@@ -254,15 +295,24 @@ public:
     bool IsShown();
     bool IsTopLevel();
     void Layout();
     bool IsShown();
     bool IsTopLevel();
     void Layout();

+#ifdef wxUSE_WX_RESOURCES

     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);

+#endif

     void Lower();
     void Lower();

-    void MakeModal(bool flag);
-    %name(MoveXY)void Move(int x, int y);
-    void Move(const wxPoint& point);
+    void MakeModal(bool flag=TRUE);
+    %name(MoveXY)void Move(int x, int y, int flags = wxSIZE_USE_EXISTING);
+    void Move(const wxPoint& point, int flags = wxSIZE_USE_EXISTING);

 
     wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     void PushEventHandler(wxEvtHandler* handler);
 
 
     wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     void PushEventHandler(wxEvtHandler* handler);
 

+        // find the given handler in the event handler chain and remove (but
+        // not delete) it from the event handler chain, return TRUE if it was
+        // found and FALSE otherwise (this also results in an assert failure so
+        // this function should only be called when the handler is supposed to
+        // be there)
+    bool RemoveEventHandler(wxEvtHandler *handler);
+

     %name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
     bool PopupMenu(wxMenu *menu, const wxPoint& pos);
 
     %name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
     bool PopupMenu(wxMenu *menu, const wxPoint& pos);
 


@@ -270,7 +320,7 @@ public:
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void RefreshRect(const wxRect& rect);
 

-    void ReleaseMouse();
+    void AddChild(wxWindow* child);

     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 
     void RemoveChild(wxWindow* child);
     bool Reparent( wxWindow* newParent );
 


@@ -279,13 +329,13 @@ public:
     wxPoint ScreenToClient(const wxPoint& pt);
 
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     wxPoint ScreenToClient(const wxPoint& pt);
 
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);

-    void SetAcceleratorTable(const wxAcceleratorTable& accel);

     void SetAutoLayout(bool autoLayout);
     bool GetAutoLayout();
     void SetBackgroundColour(const wxColour& colour);
     void SetConstraints(wxLayoutConstraints *constraints);
     void UnsetConstraints(wxLayoutConstraints *constraints);
     void SetFocus();
     void SetAutoLayout(bool autoLayout);
     bool GetAutoLayout();
     void SetBackgroundColour(const wxColour& colour);
     void SetConstraints(wxLayoutConstraints *constraints);
     void UnsetConstraints(wxLayoutConstraints *constraints);
     void SetFocus();

+    void SetFocusFromKbd();

     bool AcceptsFocus();
     void SetFont(const wxFont& font);
     void SetForegroundColour(const wxColour& colour);
     bool AcceptsFocus();
     void SetFont(const wxFont& font);
     void SetForegroundColour(const wxColour& colour);


@@ -300,8 +350,8 @@ public:
             self->SetSize(size);
         }
 
             self->SetSize(size);
         }
 

-        void SetPosition(const wxPoint& pos) {
-            self->Move(pos);
+        void SetPosition(const wxPoint& pos, int flags = wxSIZE_USE_EXISTING) {
+            self->Move(pos, flags);

         }
 
         void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {
         }
 
         void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {


@@ -309,19 +359,36 @@ public:
         }
     }
 
         }
     }
 

-    void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
+    void SetSizeHints(int minW,    int minH,
+                      int maxW=-1, int maxH=-1,
+                      int incW=-1, int incH=-1);
+    void SetVirtualSizeHints( int minW, int minH,
+                              int maxW = -1, int maxH = -1 );
+
+    void SetVirtualSize( const wxSize &size );
+    %name(SetVirtualSizeWH)void SetVirtualSize( int x, int y );
+
+    wxSize GetVirtualSize() const;
+    %name(GetVirtualSizeTuple)void GetVirtualSize( int *OUTPUT, int *OUTPUT ) const;
+
+    wxSize GetBestVirtualSize();
+

     %name(SetClientSizeWH)void SetClientSize(int width, int height);
     void SetClientSize(const wxSize& size);
     //void SetPalette(wxPalette* palette);
     %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);
     void SetEventHandler(wxEvtHandler* handler);
     void SetExtraStyle(long exStyle);
     void SetTitle(const wxString& title);

-    bool Show(bool show);
+    bool Show(bool show=TRUE);

     bool TransferDataFromWindow();
     bool TransferDataToWindow();
     bool TransferDataFromWindow();
     bool TransferDataToWindow();

+
+    // send wxUpdateUIEvents to this window, and children if recurse is TRUE
+    void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+

     bool Validate();
     bool Validate();

-    void WarpPointer(int x, int y);

 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);
 
     %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
     %name(ConvertDialogSizeToPixels)  wxSize  ConvertDialogToPixels(const wxSize& sz);


@@ -336,9 +403,14 @@ public:
     void SetToolTip(wxToolTip *tooltip);
     wxToolTip* GetToolTip();
 
     void SetToolTip(wxToolTip *tooltip);
     wxToolTip* GetToolTip();
 

-    void SetSizer(wxSizer* sizer);
+    void SetSizer(wxSizer* sizer, bool deleteOld=TRUE);
+    void SetSizerAndFit(wxSizer *sizer, bool deleteOld=TRUE);

     wxSizer* GetSizer();
 
     wxSizer* GetSizer();
 

+        // Track if this window is a member of a sizer
+    void SetContainingSizer(wxSizer* sizer);
+    wxSizer *GetContainingSizer() const;
+

     wxValidator* GetValidator();
     void SetValidator(const wxValidator& validator);
 
     wxValidator* GetValidator();
     void SetValidator(const wxValidator& validator);
 


@@ -347,13 +419,21 @@ public:
     %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
 
     wxSize GetBestSize();
     %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
 
     wxSize GetBestSize();

+    wxSize GetMaxSize();
+
+    // There are times (and windows) where 'Best' size and 'Min' size
+    // are vastly out of sync.  This should be remedied somehow, but in
+    // the meantime, this method will return the larger of BestSize
+    // (the window's smallest legible size), and any user specified
+    // MinSize hint.
+    wxSize GetAdjustedBestSize();

 
     void SetCaret(wxCaret *caret);
     wxCaret *GetCaret();
     %pragma(python) addtoclass = "# replaces broken shadow method
     def GetCaret(self, *_args, **_kwargs):
         from misc2 import wxCaretPtr
 
     void SetCaret(wxCaret *caret);
     wxCaret *GetCaret();
     %pragma(python) addtoclass = "# replaces broken shadow method
     def GetCaret(self, *_args, **_kwargs):
         from misc2 import wxCaretPtr

-        val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
+        val = windowsc.wxWindow_GetCaret(self, *_args, **_kwargs)

         if val: val = wxCaretPtr(val)
         return val
     "
         if val: val = wxCaretPtr(val)
         return val
     "


@@ -364,6 +444,7 @@ public:
 
     wxString GetHelpText();
     void SetHelpText(const wxString& helpText);
 
     wxString GetHelpText();
     void SetHelpText(const wxString& helpText);

+    void SetHelpTextForId(const wxString& text);

 
     bool ScrollLines(int lines);
     bool ScrollPages(int pages);
 
     bool ScrollLines(int lines);
     bool ScrollPages(int pages);


@@ -377,6 +458,64 @@ public:
     static int NextControlId(int id);
     static int PrevControlId(int id);
 
     static int NextControlId(int id);
     static int PrevControlId(int id);
 

+    void SetAcceleratorTable(const wxAcceleratorTable& accel);
+    wxAcceleratorTable *GetAcceleratorTable();
+
+    %addmethods {
+        // hot keys (system wide accelerators)
+        bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) {
+#if wxUSE_HOTKEY
+            return self->RegisterHotKey(hotkeyId, modifiers, keycode);
+#else
+            return FALSE;
+#endif
+        }
+
+        bool UnregisterHotKey(int hotkeyId) {
+#if wxUSE_HOTKEY
+            return self->UnregisterHotKey(hotkeyId);
+#else
+            return FALSE;
+#endif
+        }
+    }
+
+#ifdef __WXMSW__
+    // A way to do the native draw first...  Too bad it isn't in wxGTK too.
+    void OnPaint(wxPaintEvent& event);
+#endif
+
+    wxWindow* GetDefaultItem();
+    wxWindow* SetDefaultItem(wxWindow *btn);
+    void SetTmpDefaultItem(wxWindow *win);
+
+    // move the mouse to the specified position
+    void WarpPointer(int x, int y);
+
+    // start or end mouse capture, these functions maintain the stack of
+    // windows having captured the mouse and after calling ReleaseMouse()
+    // the mouse is not released but returns to the window which had had
+    // captured it previously (if any)
+    void CaptureMouse();
+    void ReleaseMouse();
+
+    // get the window which currently captures the mouse or NULL
+    static wxWindow *GetCapture();
+
+    // does this window have the capture?
+    bool HasCapture() const;
+
+    void SetThemeEnabled(bool enable);
+    bool GetThemeEnabled();
+
+    // get the window border style from the given flags: this is different from
+    // simply doing flags & wxBORDER_MASK because it uses GetDefaultBorder() to
+    // translate wxBORDER_DEFAULT to something reasonable
+    %name(GetBorderFlags) wxBorder GetBorder(long flags) const;
+
+    // get border for the flags of this window
+    wxBorder GetBorder() const;
+

 };
 
 
 };
 
 


@@ -409,6 +548,27 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #endif
 
 
 #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 {
 //---------------------------------------------------------------------------
 
 class wxPanel : public wxWindow {


@@ -418,7 +578,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL,

-            const char* name = "panel");
+            const wxString& name = wxPyPanelNameStr);

     %name(wxPrePanel)wxPanel();
 
     bool Create(wxWindow* parent,
     %name(wxPrePanel)wxPanel();
 
     bool Create(wxWindow* parent,


@@ -426,51 +586,12 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL,

-                const char* name = "panel");
-
-    void InitDialog();
-    wxButton* GetDefaultItem();
-    void SetDefaultItem(wxButton *btn);
-
-};
-
-//---------------------------------------------------------------------------
+                const wxString& name = wxPyPanelNameStr);

 
 

-class wxDialog : public wxPanel {
-public:
-    wxDialog(wxWindow* parent,
-             const wxWindowID id,
-             const wxString& title,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const char* name = "dialogBox");
-    %name(wxPreDialog)wxDialog();
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"

 
 

-    bool Create(wxWindow* parent,
-                const wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE,
-                const char* name = "dialogBox");
-
-    void Centre(int direction = wxBOTH);
-    void EndModal(int retCode);
-    wxString GetTitle();
-    void Iconize(bool iconize);
-    bool IsIconized();
-    void SetModal(bool flag);
-    bool IsModal();
-    void SetTitle(const wxString& title);
-    bool Show(bool show);
-    int ShowModal();
-
-    int  GetReturnCode();
-    void SetReturnCode(int retCode);
-
-    wxSizer* CreateTextSizer( const wxString &message );
-    wxSizer* CreateButtonSizer( long flags );
+    void InitDialog();

 
 };
 
 
 };
 


@@ -488,7 +609,7 @@ public:
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxHSCROLL | wxVSCROLL,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxHSCROLL | wxVSCROLL,

-                     char* name = "scrolledWindow");
+                     const wxString& name = wxPyPanelNameStr);

     %name(wxPreScrolledWindow)wxScrolledWindow();
 
     bool Create(wxWindow* parent,
     %name(wxPreScrolledWindow)wxScrolledWindow();
 
     bool Create(wxWindow* parent,


@@ -496,13 +617,15 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHSCROLL | wxVSCROLL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHSCROLL | wxVSCROLL,

-                char* name = "scrolledWindow");
+                const wxString& name = wxPyPanelNameStr);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreScrolledWindow:val._setOORInfo(val)"

 
     void EnableScrolling(bool xScrolling, bool yScrolling);
     int GetScrollPageSize(int orient);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
     wxWindow* GetTargetWindow();
 
     void EnableScrolling(bool xScrolling, bool yScrolling);
     int GetScrollPageSize(int orient);
     void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
     wxWindow* GetTargetWindow();

-    void GetVirtualSize(int* OUTPUT, int* OUTPUT);

     bool IsRetained();
     void PrepareDC(wxDC& dc);
     void Scroll(int x, int y);
     bool IsRetained();
     void PrepareDC(wxDC& dc);
     void Scroll(int x, int y);


@@ -514,14 +637,41 @@ public:
     void GetViewStart(int* OUTPUT, int* OUTPUT);
     %pragma(python) addtoclass = "ViewStart = GetViewStart"
 
     void GetViewStart(int* OUTPUT, int* OUTPUT);
     %pragma(python) addtoclass = "ViewStart = GetViewStart"
 

-    void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
-    void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
+    %name(CalcScrolledPosition1)wxPoint CalcScrolledPosition(const wxPoint& pt);
+    %name(CalcScrolledPosition2)void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
+
+    %name(CalcUnscrolledPosition1)wxPoint CalcUnscrolledPosition(const wxPoint& pt);
+    %name(CalcUnscrolledPosition2)void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
+
+    %pragma(python) addtoclass = "
+    def CalcScrolledPosition(self, *args):
+        if len(args) == 1:
+            return self.CalcScrolledPosition1(*args)
+        elif len(args) == 2:
+            return self.CalcScrolledPosition2(*args)
+        else:
+            raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
+
+    def CalcUnscrolledPosition(self, *args):
+        if len(args) == 1:
+            return self.CalcUnscrolledPosition1(*args)
+        elif len(args) == 2:
+            return self.CalcUnscrolledPosition2(*args)
+        else:
+            raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
+"

 
     void SetScale(double xs, double ys);
     double GetScaleX();
     double GetScaleY();
 
     void AdjustScrollbars();
 
     void SetScale(double xs, double ys);
     double GetScaleX();
     double GetScaleY();
 
     void AdjustScrollbars();

+
+    bool Layout();
+
+    // Set the x, y scrolling increments.
+    void SetScrollRate( int xstep, int ystep );
+

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -529,16 +679,65 @@ public:
 
 class wxMenu : public wxEvtHandler {
 public:
 
 class wxMenu : public wxEvtHandler {
 public:

-    wxMenu(const wxString& title = wxPyEmptyStr, long style = 0);
+    wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"

 
     void Append(int id, const wxString& item,
 
     void Append(int id, const wxString& item,

-                const wxString& helpString = wxPyEmptyStr,
-                int checkable = FALSE);
+                const wxString& helpString = wxPyEmptyString,
+                wxItemKind kind = wxITEM_NORMAL);

     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,

-                const wxString& helpString = wxPyEmptyStr);
+                                 const wxString& helpString = wxPyEmptyString);

     %name(AppendItem)void Append(const wxMenuItem* item);
     %name(AppendItem)void Append(const wxMenuItem* item);

-
+    void AppendCheckItem(int id,
+                         const wxString& text,
+                         const wxString& help = wxPyEmptyString);
+    void AppendRadioItem(int id,
+                         const wxString& text,
+                         const wxString& help = wxPyEmptyString);

     void AppendSeparator();
     void AppendSeparator();

+
+
+    void Insert(size_t pos,
+                int id,
+                const wxString& text,
+                const wxString& help = wxPyEmptyString,
+                wxItemKind kind = wxITEM_NORMAL);
+    void InsertSeparator(size_t pos);
+    void InsertCheckItem(size_t pos,
+                         int id,
+                         const wxString& text,
+                         const wxString& help = wxPyEmptyString);
+    void InsertRadioItem(size_t pos,
+                         int id,
+                         const wxString& text,
+                         const wxString& help = wxPyEmptyString);
+    %name(InsertMenu)void Insert(size_t pos,
+                                 int id,
+                                 const wxString& text,
+                                 wxMenu *submenu,
+                                 const wxString& help = wxPyEmptyString);
+    %name(InsertItem)bool Insert(size_t pos, wxMenuItem *item);
+
+
+    void Prepend(int id,
+                 const wxString& text,
+                 const wxString& help = wxPyEmptyString,
+                 wxItemKind kind = wxITEM_NORMAL);
+    void PrependSeparator();
+    void PrependCheckItem(int id,
+                          const wxString& text,
+                          const wxString& help = wxPyEmptyString);
+    void PrependRadioItem(int id,
+                          const wxString& text,
+                          const wxString& help = wxPyEmptyString);
+    %name(PrependMenu)void Prepend(int id,
+                                   const wxString& text,
+                                   wxMenu *submenu,
+                                   const wxString& help = wxPyEmptyString);
+    %name(PrependItem)void Prepend(wxMenuItem *item);
+
+

     void Break();
     void Check(int id, bool flag);
     bool IsChecked(int id);
     void Break();
     void Check(int id, bool flag);
     bool IsChecked(int id);


@@ -547,6 +746,7 @@ public:
 
     int FindItem(const wxString& itemString);
     %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);
 
     int FindItem(const wxString& itemString);
     %name(FindItemById)wxMenuItem* FindItem(int id/*, wxMenu **menu = NULL*/);

+    wxMenuItem* FindItemByPosition(size_t position) const;

 
     wxString GetTitle();
     void SetTitle(const wxString& title);
 
     wxString GetTitle();
     void SetTitle(const wxString& title);


@@ -560,10 +760,10 @@ public:
 
     bool Delete(int id);
     %name(DeleteItem)bool Delete(wxMenuItem *item);
 
     bool Delete(int id);
     %name(DeleteItem)bool Delete(wxMenuItem *item);

-    bool Insert(size_t pos, wxMenuItem *item);

     wxMenuItem *Remove(int id);
     %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
 
     wxMenuItem *Remove(int id);
     %name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
 

+

     %addmethods {
         void Destroy() { delete self; }
     }
     %addmethods {
         void Destroy() { delete self; }
     }


@@ -600,6 +800,8 @@ class wxMenuBar : public wxWindow {
 public:
     wxMenuBar(long style = 0);
 
 public:
     wxMenuBar(long style = 0);
 

+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+

     bool Append(wxMenu *menu, const wxString& title);
     bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     size_t GetMenuCount();
     bool Append(wxMenu *menu, const wxString& title);
     bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     size_t GetMenuCount();


@@ -607,6 +809,7 @@ public:
     wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     wxMenu *Remove(size_t pos);
     void EnableTop(size_t pos, bool enable);
     wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     wxMenu *Remove(size_t pos);
     void EnableTop(size_t pos, bool enable);

+    bool IsEnabledTop(size_t pos);

     void SetLabelTop(size_t pos, const wxString& label);
     wxString GetLabelTop(size_t pos);
     int FindMenu(const wxString& title);
     void SetLabelTop(size_t pos, const wxString& label);
     wxString GetLabelTop(size_t pos);
     int FindMenu(const wxString& title);


@@ -631,18 +834,21 @@ public:
 class wxMenuItem : public wxObject {
 public:
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
 class wxMenuItem : public wxObject {
 public:
     wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,

-               const wxString& text = wxPyEmptyStr,
-               const wxString& help = wxPyEmptyStr,
-               bool isCheckable = FALSE, wxMenu* subMenu = NULL);
+               const wxString& text = wxPyEmptyString,
+               const wxString& help = wxPyEmptyString,
+               wxItemKind kind = wxITEM_NORMAL,
+               wxMenu* subMenu = NULL);

 
 
     wxMenu *GetMenu();
 
 
     wxMenu *GetMenu();

+    void SetMenu(wxMenu* menu);

     void SetId(int id);
     int  GetId();
     bool IsSeparator();
     void SetText(const wxString& str);
     wxString GetLabel();
     const wxString& GetText();
     void SetId(int id);
     int  GetId();
     bool IsSeparator();
     void SetText(const wxString& str);
     wxString GetLabel();
     const wxString& GetText();

+    wxItemKind GetKind();

     void SetCheckable(bool checkable);
     bool IsCheckable();
     bool IsSubMenu();
     void SetCheckable(bool checkable);
     bool IsCheckable();
     bool IsSubMenu();


@@ -659,29 +865,30 @@ public:
     void SetAccel(wxAcceleratorEntry *accel);
 
     static wxString GetLabelFromText(const wxString& text);
     void SetAccel(wxAcceleratorEntry *accel);
 
     static wxString GetLabelFromText(const wxString& text);

+//    static wxAcceleratorEntry *GetAccelFromString(const wxString& label);

 
     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);
 
     // wxOwnerDrawn methods
 #ifdef __WXMSW__
     void SetFont(const wxFont& font);

-    wxFont& GetFont();
+    wxFont GetFont();

     void SetTextColour(const wxColour& colText);
     wxColour GetTextColour();
     void SetBackgroundColour(const wxColour& colBack);
     wxColour GetBackgroundColour();
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);
     void SetTextColour(const wxColour& colText);
     wxColour GetTextColour();
     void SetBackgroundColour(const wxColour& colBack);
     wxColour GetBackgroundColour();
     void SetBitmaps(const wxBitmap& bmpChecked,
                     const wxBitmap& bmpUnchecked = wxNullBitmap);

-    void SetBitmap(const wxBitmap& bmpChecked);
-    const wxBitmap& GetBitmap(bool bChecked = TRUE);
+    //void SetBitmap(const wxBitmap& bmpChecked);
+    //wxBitmap GetBitmap(bool bChecked = TRUE);

     void SetMarginWidth(int nWidth);
     int GetMarginWidth();
     static int GetDefaultMarginWidth();
     void SetMarginWidth(int nWidth);
     int GetMarginWidth();
     static int GetDefaultMarginWidth();

-    //void SetName(const wxString& strName);
-    //const wxString& GetName();
-    //void SetCheckable(bool checkable);
-    //bool IsCheckable();

     bool IsOwnerDrawn();
     void ResetOwnerDrawn();
 #endif
     bool IsOwnerDrawn();
     void ResetOwnerDrawn();
 #endif

+
+    void SetBitmap(const wxBitmap& bitmap);
+    const wxBitmap& GetBitmap();
+

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------