projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another attempt to fix wxPanel/wxFrame::m_winLastFocused handling
[wxWidgets.git]
/
include
/
wx
/
gdicmn.h
diff --git
a/include/wx/gdicmn.h
b/include/wx/gdicmn.h
index 7518f8aaf0610548ed6e362407634a43336c41c1..5cc489ac20eaab28dd337a730b0ceab6fcb6b395 100644
(file)
--- a/
include/wx/gdicmn.h
+++ b/
include/wx/gdicmn.h
@@
-48,7
+48,7
@@
class WXDLLEXPORT wxString;
// ---------------------------------------------------------------------------
// Bitmap flags
// ---------------------------------------------------------------------------
// Bitmap flags
-enum
+enum
wxBitmapType
{
wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
wxBITMAP_TYPE_BMP,
{
wxBITMAP_TYPE_INVALID, // should be == 0 for compatibility!
wxBITMAP_TYPE_BMP,
@@
-123,6
+123,8
@@
enum wxStockCursor
wxCURSOR_BASED_ARROW_DOWN,
#endif // X11
wxCURSOR_BASED_ARROW_DOWN,
#endif // X11
+ wxCURSOR_ARROWWAIT,
+
wxCURSOR_MAX
};
wxCURSOR_MAX
};
@@
-167,7
+169,7
@@
enum wxStockCursor
#if defined(__WXMSW__) || defined(__WXPM__)
#define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
#if defined(__WXMSW__) || defined(__WXPM__)
#define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
|| defined(__WXMAC__)
// Initialize from an included XPM
#define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
#else // other platforms
// Initialize from an included XPM
#define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
#else // other platforms
@@
-507,6
+509,10
@@
extern wxSize WXDLLEXPORT wxGetDisplaySize();
extern void WXDLLEXPORT wxDisplaySizeMM(int *width, int *height);
extern wxSize WXDLLEXPORT wxGetDisplaySizeMM();
extern void WXDLLEXPORT wxDisplaySizeMM(int *width, int *height);
extern wxSize WXDLLEXPORT wxGetDisplaySizeMM();
+// Get position and size of the display workarea
+extern void WXDLLEXPORT wxClientDisplayRect(int *x, int *y, int *width, int *height);
+extern wxRect WXDLLEXPORT wxGetClientDisplayRect();
+
// set global cursor
extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
// set global cursor
extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);