X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa9982d7106342e739c3fa66ac40d0d0a2b022ff..2d4957f2401a8814f90cda21ef945d99bc74596e:/include/wx/defs.h?ds=sidebyside diff --git a/include/wx/defs.h b/include/wx/defs.h index d2bca34863..c59c71ee43 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1418,7 +1418,7 @@ enum /* id for a separator line in the menu (invalid for normal item) */ enum { - wxID_SEPARATOR = -1 + wxID_SEPARATOR = -2 }; /* Standard menu IDs */ @@ -2016,22 +2016,22 @@ typedef unsigned short WXWORD; typedef void* WXWidget; typedef void* WXWindow; typedef void* WXDisplay; -/* -typedef WindowPtr WXHWND; -typedef Handle WXHANDLE; -typedef CIconHandle WXHICON; -// typedef unsigned long WXHFONT; */ -typedef MenuHandle WXHMENU; + +/* typedef WindowPtr WXHWND; */ +/* typedef Handle WXHANDLE; */ +/* typedef CIconHandle WXHICON; */ +/* typedef unsigned long WXHFONT; */ +/* typedef MenuHandle WXHMENU; */ /* typedef unsigned long WXHPEN; */ /* typedef unsigned long WXHBRUSH; */ /* typedef unsigned long WXHPALETTE; */ -typedef CursHandle WXHCURSOR; -typedef RgnHandle WXHRGN; +/* typedef CursHandle WXHCURSOR; */ +/* typedef RgnHandle WXHRGN; */ /* typedef unsigned long WXHACCEL; */ /* typedef unsigned long WXHINSTANCE; */ /* typedef unsigned long WXHIMAGELIST; */ /* typedef unsigned long WXHGLOBAL; */ -typedef GrafPtr WXHDC; +/* typedef GrafPtr WXHDC; */ /* typedef unsigned int WXWPARAM; */ /* typedef long WXLPARAM; */ /* typedef void * WXRGNDATA; */ @@ -2041,11 +2041,11 @@ typedef GrafPtr WXHDC; /* typedef void * WXDRAWITEMSTRUCT; */ /* typedef void * WXMEASUREITEMSTRUCT; */ /* typedef void * WXLPCREATESTRUCT; */ -typedef int (*WXFARPROC)(); +/* typedef int (*WXFARPROC)(); */ + +/* typedef WindowPtr WXWindow; */ +/* typedef ControlHandle WXWidget; */ -typedef WindowPtr WXWindow; -typedef ControlHandle WXWidget; -*/ #endif #ifdef __WXCOCOA__