From dc3b0532ee434e7344cc939526c982918bfd3d4f Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Tue, 27 May 2003 06:09:38 +0000 Subject: [PATCH] Committing in . OpenVMS complie issues + src/generic/statline.cpp : setup should be runned before first #ifdef Modified Files: wxWindows/src/generic/descrip.mms wxWindows/src/generic/statline.cpp wxWindows/src/motif/descrip.mms wxWindows/src/x11/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/descrip.mms | 3 --- src/generic/statline.cpp | 2 +- src/motif/descrip.mms | 6 +++--- src/x11/descrip.mms | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index 08eb79db17..458443b539 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -51,7 +51,6 @@ OBJECTS = \ gridctrl.obj,\ gridsel.obj,\ helpext.obj,\ - helphtml.obj,\ imaglist.obj,\ laywin.obj,\ listctrl.obj,\ @@ -88,7 +87,6 @@ SOURCES = \ gridctrl.cpp,\ gridsel.cpp,\ helpext.cpp,\ - helphtml.cpp,\ imaglist.cpp,\ laywin.cpp,\ listctrl.cpp,\ @@ -152,7 +150,6 @@ grid.obj : grid.cpp gridctrl.obj : gridctrl.cpp gridsel.obj : gridsel.cpp helpext.obj : helpext.cpp -helphtml.obj : helphtml.cpp imaglist.obj : imaglist.cpp laywin.obj : laywin.cpp listctrl.obj : listctrl.cpp diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp index 122af46799..d1c9657c1a 100644 --- a/src/generic/statline.cpp +++ b/src/generic/statline.cpp @@ -20,9 +20,9 @@ #pragma implementation "statline.h" #endif +#include "wx/wxprec.h" #if wxUSE_STATLINE // For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms index ef77353e27..6e86386049 100644 --- a/src/motif/descrip.mms +++ b/src/motif/descrip.mms @@ -35,7 +35,7 @@ OBJECTS = \ choice.obj,\ clipbrd.obj,\ colour.obj,\ - combobox_native.obj,\ + combobox.obj,\ control.obj,\ cursor.obj,\ data.obj,\ @@ -89,7 +89,7 @@ SOURCES = \ choice.cpp,\ clipbrd.cpp,\ colour.cpp,\ - combobox_native.cpp,\ + combobox.cpp,\ control.cpp,\ cursor.cpp,\ data.cpp,\ @@ -152,7 +152,7 @@ checklst.obj : checklst.cpp choice.obj : choice.cpp clipbrd.obj : clipbrd.cpp colour.obj : colour.cpp -combobox_native.obj : combobox_native.cpp +combobox.obj : combobox.cpp control.obj : control.cpp cursor.obj : cursor.cpp data.obj : data.cpp diff --git a/src/x11/descrip.mms b/src/x11/descrip.mms index b6d13ba842..8a19bc7e02 100644 --- a/src/x11/descrip.mms +++ b/src/x11/descrip.mms @@ -46,5 +46,5 @@ all : $(SOURCES) bitmap.obj : bitmap.cpp brush.obj : brush.cpp pen.obj : pen.cpp -region.obj: region.cpp +region.obj : region.cpp utilsx.obj : utilsx.cpp -- 2.45.2