X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4acff284f9516e2a4f0fcfa7bcfa3f497b8005cc..c5a2f2747825dc64950478738b113bc2e79f0f25:/wxPython/src/windows.i diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i index 10778765a6..5b6ccf56da 100644 --- a/wxPython/src/windows.i +++ b/wxPython/src/windows.i @@ -195,7 +195,6 @@ public: %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)" - void CaptureMouse(); void Center(int direction = wxBOTH); void Centre(int direction = wxBOTH); void CentreOnParent(int direction = wxBOTH ); @@ -217,10 +216,17 @@ public: 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); + void Fit(); + + // set virtual size to satisfy children + void FitInside(); + wxColour GetBackgroundColour(); wxBorder GetBorder() const; @@ -290,7 +296,9 @@ public: bool IsShown(); bool IsTopLevel(); void Layout(); +#ifdef wxUSE_WX_RESOURCES bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL); +#endif void Lower(); void MakeModal(bool flag=TRUE); %name(MoveXY)void Move(int x, int y, int flags = wxSIZE_USE_EXISTING); @@ -313,7 +321,7 @@ public: 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 ); @@ -328,6 +336,7 @@ public: void SetConstraints(wxLayoutConstraints *constraints); void UnsetConstraints(wxLayoutConstraints *constraints); void SetFocus(); + void SetFocusFromKbd(); bool AcceptsFocus(); void SetFont(const wxFont& font); void SetForegroundColour(const wxColour& colour); @@ -351,11 +360,25 @@ 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); - 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); @@ -364,7 +387,6 @@ public: bool TransferDataToWindow(); void UpdateWindowUI(); bool Validate(); - void WarpPointer(int x, int y); %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt); %name(ConvertDialogSizeToPixels) wxSize ConvertDialogToPixels(const wxSize& sz); @@ -380,6 +402,7 @@ public: wxToolTip* GetToolTip(); void SetSizer(wxSizer* sizer, bool deleteOld=TRUE); + void SetSizerAndFit(wxSizer *sizer, bool deleteOld=TRUE); wxSizer* GetSizer(); // Track if this window is a member of a sizer @@ -389,15 +412,20 @@ public: wxValidator* GetValidator(); void SetValidator(const wxValidator& validator); -#ifndef __WXMAC__ void SetDropTarget(wxDropTarget* target); wxDropTarget* GetDropTarget(); %pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0" -#endif 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 @@ -438,6 +466,23 @@ public: 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; }; @@ -470,6 +515,27 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) { #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 { @@ -527,7 +593,6 @@ public: 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); @@ -570,6 +635,10 @@ public: void AdjustScrollbars(); bool Layout(); + + // Set the x, y scrolling increments. + void SetScrollRate( int xstep, int ystep ); + }; //---------------------------------------------------------------------- @@ -708,6 +777,7 @@ public: 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); @@ -774,18 +844,18 @@ public: wxColour GetBackgroundColour(); void SetBitmaps(const wxBitmap& bmpChecked, const wxBitmap& bmpUnchecked = wxNullBitmap); - void SetBitmap(const wxBitmap& bmpChecked); - 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 SetName(const wxString& strName); - //const wxString& GetName(); - //void SetCheckable(bool checkable); - //bool IsCheckable(); bool IsOwnerDrawn(); void ResetOwnerDrawn(); #endif + + void SetBitmap(const wxBitmap& bitmap); + const wxBitmap& GetBitmap(); + }; //---------------------------------------------------------------------------