minor additions and bugfixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -153,69 +153,6 @@ public:
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// Dialog Functions
|
||||
|
||||
wxString wxFileSelector(char* message,
|
||||
char* default_path = NULL,
|
||||
char* default_filename = NULL,
|
||||
char* default_extension = NULL,
|
||||
char* wildcard = "*.*",
|
||||
int flags = 0,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1);
|
||||
|
||||
wxString wxGetTextFromUser(const wxString& message,
|
||||
const wxString& caption = wxPyEmptyStr,
|
||||
const wxString& default_value = wxPyEmptyStr,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1,
|
||||
bool centre = TRUE);
|
||||
|
||||
|
||||
// TODO: Need to custom wrap this one...
|
||||
// int wxGetMultipleChoice(char* message, char* caption,
|
||||
// int LCOUNT, char** LIST,
|
||||
// int nsel, int *selection,
|
||||
// wxWindow *parent = NULL, int x = -1, int y = -1,
|
||||
// bool centre = TRUE, int width=150, int height=200);
|
||||
|
||||
|
||||
wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
|
||||
int LCOUNT, wxString* LIST,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1,
|
||||
bool centre = TRUE,
|
||||
int width=150, int height=200);
|
||||
|
||||
int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
|
||||
int LCOUNT, wxString* LIST,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1,
|
||||
bool centre = TRUE,
|
||||
int width=150, int height=200);
|
||||
|
||||
|
||||
int wxMessageBox(const wxString& message,
|
||||
const wxString& caption = wxPyEmptyStr,
|
||||
int style = wxOK | wxCENTRE,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1);
|
||||
|
||||
long wxGetNumberFromUser(const wxString& message,
|
||||
const wxString& prompt,
|
||||
const wxString& caption,
|
||||
long value,
|
||||
long min = 0, long max = 100,
|
||||
wxWindow *parent = NULL,
|
||||
const wxPoint& pos = wxPyDefaultPosition);
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// GDI Functions
|
||||
|
||||
bool wxColourDisplay();
|
||||
int wxDisplayDepth();
|
||||
void wxSetCursor(wxCursor& cursor);
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// Miscellaneous functions
|
||||
@@ -225,24 +162,18 @@ void wxRegisterId(long id);
|
||||
%name(NewId) long wxNewId();
|
||||
%name(RegisterId) void wxRegisterId(long id);
|
||||
|
||||
void wxBeginBusyCursor(wxCursor *cursor = wxHOURGLASS_CURSOR);
|
||||
void wxBell();
|
||||
void wxDisplaySize(int *OUTPUT, int *OUTPUT);
|
||||
void wxEndBusyCursor();
|
||||
long wxExecute(const wxString& command, bool sync = FALSE);
|
||||
#ifdef __WXMSW__
|
||||
wxWindow * wxGetActiveWindow();
|
||||
long wxGetElapsedTime(bool resetTimer = TRUE);
|
||||
long wxGetFreeMemory();
|
||||
#endif
|
||||
void wxGetMousePosition(int* OUTPUT, int* OUTPUT);
|
||||
bool wxIsBusy();
|
||||
wxString wxNow();
|
||||
#ifdef __WXMSW__
|
||||
bool wxShell(const wxString& command = wxPyEmptyStr);
|
||||
void wxStartTimer();
|
||||
int wxGetOsVersion(int *OUTPUT, int *OUTPUT);
|
||||
#endif
|
||||
|
||||
void wxSleep(int secs);
|
||||
bool wxYield();
|
||||
@@ -257,20 +188,6 @@ void wxEnableTopLevelWindows(bool enable);
|
||||
}
|
||||
%}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// Resource System
|
||||
|
||||
bool wxResourceAddIdentifier(char *name, int value);
|
||||
void wxResourceClear(void);
|
||||
wxBitmap wxResourceCreateBitmap(char *resource);
|
||||
wxIcon wxResourceCreateIcon(char *resource);
|
||||
wxMenuBar * wxResourceCreateMenuBar(char *resource);
|
||||
int wxResourceGetIdentifier(char *name);
|
||||
bool wxResourceParseData(char *resource, wxResourceTable *table = NULL);
|
||||
bool wxResourceParseFile(char *filename, wxResourceTable *table = NULL);
|
||||
bool wxResourceParseString(char *resource, wxResourceTable *table = NULL);
|
||||
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
@@ -353,9 +270,7 @@ public:
|
||||
|
||||
wxRect GetBox();
|
||||
bool Intersect(const wxRect& rect);
|
||||
#ifdef __WXMSW__
|
||||
bool IsEmpty();
|
||||
#endif
|
||||
bool Subtract(const wxRect& rect);
|
||||
bool Union(const wxRect& rect);
|
||||
bool Xor(const wxRect& rect);
|
||||
@@ -410,118 +325,6 @@ public:
|
||||
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
enum {
|
||||
wxSYS_WHITE_BRUSH,
|
||||
wxSYS_LTGRAY_BRUSH,
|
||||
wxSYS_GRAY_BRUSH,
|
||||
wxSYS_DKGRAY_BRUSH,
|
||||
wxSYS_BLACK_BRUSH,
|
||||
wxSYS_NULL_BRUSH,
|
||||
wxSYS_HOLLOW_BRUSH,
|
||||
wxSYS_WHITE_PEN,
|
||||
wxSYS_BLACK_PEN,
|
||||
wxSYS_NULL_PEN,
|
||||
wxSYS_OEM_FIXED_FONT,
|
||||
wxSYS_ANSI_FIXED_FONT,
|
||||
wxSYS_ANSI_VAR_FONT,
|
||||
wxSYS_SYSTEM_FONT,
|
||||
wxSYS_DEVICE_DEFAULT_FONT,
|
||||
wxSYS_DEFAULT_PALETTE,
|
||||
wxSYS_SYSTEM_FIXED_FONT,
|
||||
wxSYS_DEFAULT_GUI_FONT,
|
||||
|
||||
wxSYS_COLOUR_SCROLLBAR,
|
||||
wxSYS_COLOUR_BACKGROUND,
|
||||
wxSYS_COLOUR_ACTIVECAPTION,
|
||||
wxSYS_COLOUR_INACTIVECAPTION,
|
||||
wxSYS_COLOUR_MENU,
|
||||
wxSYS_COLOUR_WINDOW,
|
||||
wxSYS_COLOUR_WINDOWFRAME,
|
||||
wxSYS_COLOUR_MENUTEXT,
|
||||
wxSYS_COLOUR_WINDOWTEXT,
|
||||
wxSYS_COLOUR_CAPTIONTEXT,
|
||||
wxSYS_COLOUR_ACTIVEBORDER,
|
||||
wxSYS_COLOUR_INACTIVEBORDER,
|
||||
wxSYS_COLOUR_APPWORKSPACE,
|
||||
wxSYS_COLOUR_HIGHLIGHT,
|
||||
wxSYS_COLOUR_HIGHLIGHTTEXT,
|
||||
wxSYS_COLOUR_BTNFACE,
|
||||
wxSYS_COLOUR_BTNSHADOW,
|
||||
wxSYS_COLOUR_GRAYTEXT,
|
||||
wxSYS_COLOUR_BTNTEXT,
|
||||
wxSYS_COLOUR_INACTIVECAPTIONTEXT,
|
||||
wxSYS_COLOUR_BTNHIGHLIGHT,
|
||||
|
||||
wxSYS_COLOUR_3DDKSHADOW,
|
||||
wxSYS_COLOUR_3DLIGHT,
|
||||
wxSYS_COLOUR_INFOTEXT,
|
||||
wxSYS_COLOUR_INFOBK,
|
||||
|
||||
wxSYS_COLOUR_DESKTOP,
|
||||
wxSYS_COLOUR_3DFACE,
|
||||
wxSYS_COLOUR_3DSHADOW,
|
||||
wxSYS_COLOUR_3DHIGHLIGHT,
|
||||
wxSYS_COLOUR_3DHILIGHT,
|
||||
wxSYS_COLOUR_BTNHILIGHT,
|
||||
|
||||
wxSYS_MOUSE_BUTTONS,
|
||||
wxSYS_BORDER_X,
|
||||
wxSYS_BORDER_Y,
|
||||
wxSYS_CURSOR_X,
|
||||
wxSYS_CURSOR_Y,
|
||||
wxSYS_DCLICK_X,
|
||||
wxSYS_DCLICK_Y,
|
||||
wxSYS_DRAG_X,
|
||||
wxSYS_DRAG_Y,
|
||||
wxSYS_EDGE_X,
|
||||
wxSYS_EDGE_Y,
|
||||
wxSYS_HSCROLL_ARROW_X,
|
||||
wxSYS_HSCROLL_ARROW_Y,
|
||||
wxSYS_HTHUMB_X,
|
||||
wxSYS_ICON_X,
|
||||
wxSYS_ICON_Y,
|
||||
wxSYS_ICONSPACING_X,
|
||||
wxSYS_ICONSPACING_Y,
|
||||
wxSYS_WINDOWMIN_X,
|
||||
wxSYS_WINDOWMIN_Y,
|
||||
wxSYS_SCREEN_X,
|
||||
wxSYS_SCREEN_Y,
|
||||
wxSYS_FRAMESIZE_X,
|
||||
wxSYS_FRAMESIZE_Y,
|
||||
wxSYS_SMALLICON_X,
|
||||
wxSYS_SMALLICON_Y,
|
||||
wxSYS_HSCROLL_Y,
|
||||
wxSYS_VSCROLL_X,
|
||||
wxSYS_VSCROLL_ARROW_X,
|
||||
wxSYS_VSCROLL_ARROW_Y,
|
||||
wxSYS_VTHUMB_Y,
|
||||
wxSYS_CAPTION_Y,
|
||||
wxSYS_MENU_Y,
|
||||
wxSYS_NETWORK_PRESENT,
|
||||
wxSYS_PENWINDOWS_PRESENT,
|
||||
wxSYS_SHOW_SOUNDS,
|
||||
wxSYS_SWAP_BUTTONS,
|
||||
};
|
||||
|
||||
|
||||
|
||||
%inline %{
|
||||
|
||||
wxColour wxSystemSettings_GetSystemColour(int index) {
|
||||
return wxSystemSettings::GetSystemColour(index);
|
||||
}
|
||||
|
||||
wxFont wxSystemSettings_GetSystemFont(int index) {
|
||||
return wxSystemSettings::GetSystemFont(index);
|
||||
}
|
||||
|
||||
int wxSystemSettings_GetSystemMetric(int index) {
|
||||
return wxSystemSettings::GetSystemMetric(index);
|
||||
}
|
||||
%}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user