restored wxPluginLibrary::ms_classes handling code that was removed by mistake

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index d2bca34863f903d7e92121e5ac64af7efea1ef97..c59c71ee437dd055a8a002be1f2ac0906b1433c7 100644 (file)
--- 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
 {
 /*  id for a separator line in the menu (invalid for normal item) */
 enum
 {

-    wxID_SEPARATOR = -1
+    wxID_SEPARATOR = -2

 };
 
 /*  Standard menu IDs */
 };
 
 /*  Standard menu IDs */


@@ -2016,22 +2016,22 @@ typedef unsigned short  WXWORD;
 typedef void*       WXWidget;
 typedef void*       WXWindow;
 typedef void*       WXDisplay;
 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 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 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; */
 /* 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 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__
 #endif
 
 #ifdef __WXCOCOA__