and the compilation fix for the warning fixes

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 818540cede012805f0a2840a73f70367441444dc..422f97d30ad6d75d80b236a8b84af2ed94ad0d1b 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -805,7 +805,7 @@ enum wxStretch
 #else
 // Under Unix, the dialogs don't have a system menu. Specifying
 // wxSYSTEM_MENU here, will make a close button appear.
 #else
 // Under Unix, the dialogs don't have a system menu. Specifying
 // wxSYSTEM_MENU here, will make a close button appear.

-#   define wxDEFAULT_DIALOG_STYLE  (wxCAPTION)
+#   define wxDEFAULT_DIALOG_STYLE  (wxCAPTION|wxTHICK_FRAME)

 #endif
 
 /*
 #endif
 
 /*


@@ -1565,7 +1565,7 @@ typedef long            WXLPARAM;
 #  define LOGFONT       FATTRS
 #  define LOWORD        SHORT1FROMMP
 #  define HIWORD        SHORT2FROMMP
 #  define LOGFONT       FATTRS
 #  define LOWORD        SHORT1FROMMP
 #  define HIWORD        SHORT2FROMMP

-#endif
+#endif // __WXMSW__

 typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;
 typedef unsigned long   WXCOLORREF;
 typedef void *          WXRGNDATA;
 typedef void *          WXMSG;


@@ -1583,6 +1583,7 @@ typedef unsigned long   WXMSGID;
 typedef void*           WXRESULT;
 typedef int             (*WXFARPROC)();
 // some windows handles not defined by PM
 typedef void*           WXRESULT;
 typedef int             (*WXFARPROC)();
 // some windows handles not defined by PM

+typedef unsigned long   COLORREF;

 typedef unsigned long   HANDLE;
 typedef unsigned long   HICON;
 typedef unsigned long   HFONT;
 typedef unsigned long   HANDLE;
 typedef unsigned long   HICON;
 typedef unsigned long   HFONT;