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

diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms
index 08eb79db17ffc246106f1c56038a094669aa3149..458443b5390d63ad27a0a03e156fb2531c643bb3 100644 (file)
--- a/src/generic/descrip.mms
+++ b/src/generic/descrip.mms
@@ -51,7 +51,6 @@ OBJECTS = \
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\
                gridctrl.obj,\
                gridsel.obj,\
                helpext.obj,\

-               helphtml.obj,\

                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\
                imaglist.obj,\
                laywin.obj,\
                listctrl.obj,\


@@ -88,7 +87,6 @@ SOURCES = \
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\
                gridctrl.cpp,\
                gridsel.cpp,\
                helpext.cpp,\

-               helphtml.cpp,\

                imaglist.cpp,\
                laywin.cpp,\
                listctrl.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
 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
 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 122af4679991e6941c9b1a71a58af31dcbf771c3..d1c9657c1a719af78d01dcf0dd297605fa9f3cc3 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -20,9 +20,9 @@
     #pragma implementation "statline.h"
 #endif
 
     #pragma implementation "statline.h"
 #endif
 

+#include "wx/wxprec.h"

 #if wxUSE_STATLINE
 // For compilers that support precompilation, includes "wx.h".
 #if wxUSE_STATLINE
 // For compilers that support precompilation, includes "wx.h".

-#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/src/motif/descrip.mms b/src/motif/descrip.mms
index ef77353e2757fb30772369dff390ea8299f3746b..6e86386049b0b8a751823c4b81d398758dcf046b 100644 (file)
--- a/src/motif/descrip.mms
+++ b/src/motif/descrip.mms
@@ -35,7 +35,7 @@ OBJECTS = \
                choice.obj,\
                clipbrd.obj,\
                colour.obj,\
                choice.obj,\
                clipbrd.obj,\
                colour.obj,\

-               combobox_native.obj,\
+               combobox.obj,\

                control.obj,\
                cursor.obj,\
                data.obj,\
                control.obj,\
                cursor.obj,\
                data.obj,\


@@ -89,7 +89,7 @@ SOURCES = \
                choice.cpp,\
                clipbrd.cpp,\
                colour.cpp,\
                choice.cpp,\
                clipbrd.cpp,\
                colour.cpp,\

-               combobox_native.cpp,\
+               combobox.cpp,\

                control.cpp,\
                cursor.cpp,\
                data.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
 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
 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 b6d13ba8427a5ae0bad92a87357c3a16f12596b9..8a19bc7e025b6ec41cae717bbe4e45292b98877e 100644 (file)
--- 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
 bitmap.obj : bitmap.cpp
 brush.obj : brush.cpp
 pen.obj : pen.cpp

-region.obj: region.cpp
+region.obj : region.cpp

 utilsx.obj : utilsx.cpp
 utilsx.obj : utilsx.cpp