X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf9b6266faaa6534b75e5282aab58f1476eecbaa..d50d561a0546773b0b4771528167572aaebd3838:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 8cb02a12d8..a83a5b9b81 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -273,7 +273,7 @@ #error "Target can't be both X and Windows" #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \ - !defined(__WXQT__) && !defined(__WXMGL__) && wxUSE_GUI + !defined(__WXMGL__) && wxUSE_GUI #ifdef __UNIX__ #error "No Target! You should use wx-config program for compilation flags!" #else // !Unix @@ -603,7 +603,6 @@ enum wxGTK_WIN32, // GTK on Win32 wxGTK_OS2, // GTK on OS/2 wxGTK_BEOS, // GTK on BeOS - wxQT, // Qt wxGEOS, // GEOS wxOS2_PM, // OS/2 Workplace wxWINDOWS, // Windows or WfW @@ -1170,21 +1169,6 @@ enum wxBorder #define wxSB_HORIZONTAL wxHORIZONTAL #define wxSB_VERTICAL wxVERTICAL -/* - * wxTreeCtrl flags - */ -#define wxTR_HAS_BUTTONS 0x0004 -#define wxTR_EDIT_LABELS 0x0008 -#define wxTR_LINES_AT_ROOT 0x0010 - -#define wxTR_SINGLE 0x0000 -#define wxTR_MULTIPLE 0x0020 -#define wxTR_EXTENDED 0x0040 -#define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 -#define wxTR_NO_LINES 0x0100 -#define wxTR_MAC_BUTTONS 0x0200 -#define wxTR_ROW_LINES 0x0400 - /* * wxSpinButton flags. * Note that a wxSpinCtrl is sometimes defined as @@ -2059,7 +2043,7 @@ typedef struct _PangoFontDescription PangoFontDescription; #endif // GTK #ifdef __WXMGL__ -typedef void *WXWidget; // FIXME_MGL - type-safe +typedef struct window_t *WXWidget; #endif // MGL // This is required because of clashing macros in windows.h, which may be