Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another merge from WX_2_6_BRANCH

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-06 07:05:15 +00:00
parent 2091f5e71a
commit 095315e20d
41 changed files with 3008 additions and 38638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/__misc_rename.i
View File

@@ -105,7 +105,6 @@
%rename(Bell) wxBell;
%rename(EndBusyCursor) wxEndBusyCursor;
%rename(GetElapsedTime) wxGetElapsedTime;
%rename(GetMousePosition) wxGetMousePosition;
%rename(IsBusy) wxIsBusy;
%rename(Now) wxNow;
%rename(Shell) wxShell;
@@ -151,12 +150,15 @@
%rename(SetCursor) wxSetCursor;
%rename(GetXDisplay) wxGetXDisplay;
%rename(BeginBusyCursor) wxBeginBusyCursor;
%rename(GetMousePosition) wxGetMousePosition;
%rename(GetActiveWindow) wxGetActiveWindow;
%rename(GenericFindWindowAtPoint) wxGenericFindWindowAtPoint;
%rename(FindWindowAtPoint) wxFindWindowAtPoint;
%rename(GetTopLevelParent) wxGetTopLevelParent;
%rename(LaunchDefaultBrowser) wxLaunchDefaultBrowser;
%rename(GetKeyState) wxGetKeyState;
%rename(MouseState) wxMouseState;
%rename(GetMouseState) wxGetMouseState;
%rename(WakeUpMainThread) wxWakeUpMainThread;
%rename(MutexGuiEnter) wxMutexGuiEnter;
%rename(MutexGuiLeave) wxMutexGuiLeave;

2
wxPython/src/_dataobj.i
View File

@@ -803,7 +803,7 @@ public:
DocStr(wxURLDataObject,
"This data object holds a URL in a format that is compatible with some
browsers such that it is able to be dragged to or from them.", "");
class wxURLDataObject : public wxDataObjectComposite {
class wxURLDataObject : public wxDataObject/*Composite*/ {
public:
wxURLDataObject();

92
wxPython/src/_functions.i
View File

@@ -53,11 +53,6 @@ void wxEndBusyCursor();
long wxGetElapsedTime(bool resetTimer = true);
MustHaveApp(wxGetMousePosition);
DocDeclA(
void, wxGetMousePosition(int* OUTPUT, int* OUTPUT),
"GetMousePosition() -> (x,y)");
bool wxIsBusy();
wxString wxNow();
bool wxShell(const wxString& command = wxPyEmptyString);
@@ -278,8 +273,29 @@ other platforms.", "");
MustHaveApp(wxBeginBusyCursor);
void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
MustHaveApp(wxGetMousePosition);
DocDeclStr(
wxPoint, wxGetMousePosition(),
"Get the current mouse position on the screen.", "");
MustHaveApp(FindWindowAtPointer);
DocStr(FindWindowAtPointer,
"Returns the window currently under the mouse pointer, if it belongs to
this application. Otherwise it returns None.", "");
%inline %{
wxWindow* FindWindowAtPointer() {
wxPoint unused;
return wxFindWindowAtPointer(unused);
}
%}
MustHaveApp(wxGetActiveWindow);
wxWindow * wxGetActiveWindow();
DocDeclStr(
wxWindow *, wxGetActiveWindow(),
"Get the currently active window of this application, or None", "");
MustHaveApp(wxGenericFindWindowAtPoint);
wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt);
@@ -304,11 +320,73 @@ DocDeclStr(
bool , wxGetKeyState(wxKeyCode key),
"Get the state of a key (true if pressed or toggled on, false if not.)
This is generally most useful getting the state of the modifier or
toggle keys. On some platforms those may be the only keys that work.
toggle keys. On some platforms those may be the only keys that this
function is able to detect.
", "");
//---------------------------------------------------------------------------
DocStr(wxMouseState,
"`wx.MouseState` is used to hold information about mouse button and
modifier key states and is what is returned from `wx.GetMouseState`.",
"");
class wxMouseState
{
public:
wxMouseState();
~wxMouseState();
wxCoord GetX();
wxCoord GetY();
bool LeftDown();
bool MiddleDown();
bool RightDown();
bool ControlDown();
bool ShiftDown();
bool AltDown();
bool MetaDown();
bool CmdDown();
void SetX(wxCoord x);
void SetY(wxCoord y);
void SetLeftDown(bool down);
void SetMiddleDown(bool down);
void SetRightDown(bool down);
void SetControlDown(bool down);
void SetShiftDown(bool down);
void SetAltDown(bool down);
void SetMetaDown(bool down);
%pythoncode {
x = property(GetX, SetX)
y = property(GetY, SetY)
leftDown = property(LeftDown, SetLeftDown)
middleDown = property(MiddleDown, SetMiddleDown)
rightDown = property(RightDown, SetRightDown)
controlDown = property(ControlDown, SetControlDown)
shiftDown = property(ShiftDown, SetShiftDown)
altDown = property(AltDown, SetAltDown)
metaDown = property(MetaDown, SetMetaDown)
cmdDown = property(CmdDown)
}
};
DocDeclStr(
wxMouseState , wxGetMouseState(),
"Returns the current state of the mouse. Returns an instance of a
`wx.MouseState` object that contains the current position of the mouse
pointer in screen coordinants, as well as boolean values indicating
the up/down status of the mouse buttons and the modifier keys.", "");
//---------------------------------------------------------------------------
MustHaveApp(wxWakeUpMainThread);

12
wxPython/src/_sizers.i
View File

@@ -261,6 +261,18 @@ isn't any.", "");
return Py_None;
}
}
DocStr(SetUserData,
"Associate a Python object with this sizer item.", "");
void SetUserData(PyObject* userData) {
wxPyUserData* data = NULL;
if ( userData ) {
wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked);
}
self->SetUserData(data);
}
}
};

3
wxPython/src/media.i
View File

@@ -122,6 +122,7 @@ public:
const wxEventType wxEVT_MEDIA_FINISHED = 0;
const wxEventType wxEVT_MEDIA_STOP = 0;
const wxEventType wxEVT_MEDIA_LOADED = 0;
#endif
%}
@@ -218,10 +219,12 @@ public:
%constant wxEventType wxEVT_MEDIA_FINISHED;
%constant wxEventType wxEVT_MEDIA_STOP;
%constant wxEventType wxEVT_MEDIA_LOADED;
%pythoncode {
EVT_MEDIA_FINISHED = wx.PyEventBinder( wxEVT_MEDIA_FINISHED, 1)
EVT_MEDIA_STOP = wx.PyEventBinder( wxEVT_MEDIA_STOP, 1)
EVT_MEDIA_LOADED = wx.PyEventBinder( wxEVT_MEDIA_LOADED, 1)
}
//---------------------------------------------------------------------------