]> git.saurik.com Git - wxWidgets.git/commitdiff
Committing in .
authorJouk Jansen <joukj@hrem.nano.tudelft.nl>
Thu, 12 Jul 2001 15:02:40 +0000 (15:02 +0000)
committerJouk Jansen <joukj@hrem.nano.tudelft.nl>
Thu, 12 Jul 2001 15:02:40 +0000 (15:02 +0000)
 Modified Files:
  wxWindows/setup.h_vms wxWindows/src/common/appcmn.cpp
  wxWindows/src/common/descrip.mms
  wxWindows/src/generic/propform.cpp
  wxWindows/src/gtk/descrip.mms
  wxWindows/utils/dialoged/src/winstyle.cpp

  -Fixed VMS compile support
  -added some include's
 ----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

setup.h_vms
src/common/appcmn.cpp
src/common/descrip.mms
src/generic/propform.cpp
src/gtk/descrip.mms
src/gtk1/descrip.mms
utils/dialoged/src/winstyle.cpp

index f35965a7000b6a3ad626ae85b4ea52aded443725..56aa2d91c3400c3fda81dd56a210e83e7d693a31 100644 (file)
  * Use standard GUI logger
  */
 #define wxUSE_LOGGUI 1
+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 1
 /*
  * Use wxStopWatch
  */
 #else
 #define wxUSE_DRAG_AND_DROP 0
 #endif
+/*
+ * Use OLE (MSW only)
+*/
+#define wxUSE_OLE 0
 /*
  * Use spline
  */
 /* Define if you have the <langinfo.h> header file.  */
 #define HAVE_LANGINFO_H 1
 
+/* Define if you have the <w32api.h> header file (mingw,cygwin).  */
+#undef HAVE_W32API_H
+
+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
index 3de3b7cd2be6e0b515ee7bdf7721bf20a94d9ea1..49dfb98eed528e1194cea145139ed8f1f16d1fbd 100644 (file)
@@ -206,7 +206,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             OPTION_VERBOSE,
             gettext_noop("generate verbose log messages")
         },
-#endif wxUSE_LOG
+#endif // wxUSE_LOG
 
 #ifdef __WXUNIVERSAL__
         {
index 3fcf5e2fd0da2f365d88eb368db1d592371ecd52..132ebfbc3839780046d0ae1749c8fd59bfd0385d 100644 (file)
@@ -120,6 +120,7 @@ OBJECTS1=framecmn.obj,\
                strconv.obj,\
                stream.obj,\
                string.obj,\
+               sysopt.obj,\
                tbarbase.obj,\
                textcmn.obj,\
                textfile.obj,\
@@ -223,6 +224,7 @@ SOURCES = \
                socket.cpp,\
                strconv.cpp,\
                stream.cpp,\
+               sysopt.cpp,\
                string.cpp,\
                tbarbase.cpp,\
                textcmn.cpp,\
@@ -357,6 +359,7 @@ sizer.obj : sizer.cpp
 socket.obj : socket.cpp
 strconv.obj : strconv.cpp
 stream.obj : stream.cpp
+sysopt.obj : sysopt.cpp
 string.obj : string.cpp
 tbarbase.obj : tbarbase.cpp
 textcmn.obj : textcmn.cpp
index bfd528acc38273d3c01c9262dd1e813690f5fdcb..bfa779c272ff9a2760717de9fa775bffb9170dee 100644 (file)
@@ -25,6 +25,7 @@
 #ifndef WX_PRECOMP
 #endif
 
+#include "wx/wx.h"
 #include "wx/propform.h"
 
 #include <ctype.h>
index 096fcf489e87c63b71d52bc7d835a19992dbe19f..b66c42069ec95afb82aec63f9e26eb91b902ba70 100644 (file)
@@ -20,7 +20,6 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-       accel.obj,\
        app.obj,\
        bitmap.obj,\
         bmpbuttn.obj,\
@@ -81,7 +80,6 @@ OBJECTS = \
        window.obj
 
 SOURCES =\
-       accel.cpp,\
        app.cpp,\
        bitmap.cpp,\
         bmpbuttn.cpp,\
@@ -145,7 +143,6 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 
-accel.obj : accel.cpp
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
index 096fcf489e87c63b71d52bc7d835a19992dbe19f..b66c42069ec95afb82aec63f9e26eb91b902ba70 100644 (file)
@@ -20,7 +20,6 @@ CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/iee=denorm
        cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
-       accel.obj,\
        app.obj,\
        bitmap.obj,\
         bmpbuttn.obj,\
@@ -81,7 +80,6 @@ OBJECTS = \
        window.obj
 
 SOURCES =\
-       accel.cpp,\
        app.cpp,\
        bitmap.cpp,\
         bmpbuttn.cpp,\
@@ -145,7 +143,6 @@ all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
        library [--.lib]libwx_gtk.olb $(OBJECTS)
 
-accel.obj : accel.cpp
 app.obj : app.cpp
 bitmap.obj : bitmap.cpp
 bmpbuttn.obj : bmpbuttn.cpp
index b0b1dae327ccc210f4dcdbf84ce220884b8b6963..fbff2fd54e862ac349498d6aa4bf66ddfa53a614 100644 (file)
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
+#include "wx/listctrl.h"
 #endif
 
 #include <ctype.h>