Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for 16-bit compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-10-24 19:50:17 +00:00
parent 2d93e1335c
commit 8fb3a512a8
18 changed files with 143 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/dobjcmn.cpp
View File

@@ -293,6 +293,8 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf)
// some common dnd related code
// ============================================================================
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
// ----------------------------------------------------------------------------
@@ -331,3 +333,5 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
}
#endif

2
src/makemsc.env
View File

@@ -20,7 +20,7 @@
WXDIR = $(WXWIN)
WXINC = $(WXDIR)\include
WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
# Suffixes
OBJSUFF=obj

3
src/msw/font.cpp
View File

@@ -342,7 +342,7 @@ bool wxFont::RealizeResource()
case wxFONTENCODING_CP1250:
charset = ANSI_CHARSET;
break;
#if !defined(__WIN16__)
case wxFONTENCODING_ISO8859_2:
case wxFONTENCODING_CP1252:
charset = EASTEUROPE_CHARSET;
@@ -377,6 +377,7 @@ bool wxFont::RealizeResource()
case wxFONTENCODING_ISO8859_11:
charset = THAI_CHARSET;
break;
#endif // BC++ 16-bit
case wxFONTENCODING_CP437:
charset = OEM_CHARSET;

21
src/msw/makefile.bcc
View File

@@ -176,7 +176,7 @@ COMMONOBJS = \
$(MSWDIR)\wxexpr.obj \
$(MSWDIR)\zipstrm.obj \
$(MSWDIR)\zstream.obj \
${MSWDIR}\resourc2.cpp
${MSWDIR}\resourc2.obj
MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
@@ -263,9 +263,14 @@ wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
$(LIBTARGET): $(DUMMY).obj $(OBJECTS) $(PERIPH_LIBS)
erase $(LIBTARGET)
tlib $(LIBTARGET) /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
+$(COMMONOBJS:.obj =.obj +)\
+$(GENERICOBJS:.obj =.obj +)\
+$(MSWOBJS:.obj =.obj +)\
+$(PERIPH_LIBS:.lib =.lib +)
!
#+$(OBJECTS:.obj =.obj +)
dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
@@ -349,7 +354,7 @@ $(MSWDIR)\frame.obj: $(MSWDIR)\frame.$(SRCSUFF)
$(MSWDIR)\gaugemsw.obj: $(MSWDIR)\gaugemsw.$(SRCSUFF)
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdi$(SRCSUFF).obj
$(MSWDIR)\gdiobj.obj: $(MSWDIR)\gdiobj.$(SRCSUFF)
$(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
@@ -464,7 +469,7 @@ $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)
$(MSWDIR)\dlgcmn.obj: $(COMMDIR)\dlgcmn.$(SRCSUFF)
$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\d$(SRCSUFF)cmn.obj
$(MSWDIR)\dobjcmn.obj: $(COMMDIR)\dobjcmn.$(SRCSUFF)
$(MSWDIR)\docmdi.obj: $(COMMDIR)\docmdi.$(SRCSUFF)
@@ -530,9 +535,9 @@ $(MSWDIR)\module.obj: $(COMMDIR)\module.$(SRCSUFF)
$(MSWDIR)\mstream.obj: $(COMMDIR)\mstream.$(SRCSUFF)
$(MSWDIR)\object.obj: $(COMMDIR)\$(SRCSUFF)ect.obj
$(MSWDIR)\object.obj: $(COMMDIR)\object.$(SRCSUFF)
$(MSWDIR)\objstrm.obj: $(COMMDIR)\$(SRCSUFF)strm.obj
$(MSWDIR)\objstrm.obj: $(COMMDIR)\objstrm.$(SRCSUFF)
$(MSWDIR)\paper.obj: $(COMMDIR)\paper.$(SRCSUFF)
@@ -590,9 +595,7 @@ $(MSWDIR)\zipstrm.obj: $(COMMDIR)\zipstrm.$(SRCSUFF)
$(MSWDIR)\zstream.obj: $(COMMDIR)\zstream.$(SRCSUFF)
${MSWDIR}\resourc2.cpp: ${COMMDIR}\resourc2.cpp
${MSWDIR}\resourc2.obj: ${COMMDIR}\resourc2.$(SRCSUFF)
########################################################
# Generic objects (not always compiled, depending on

39
src/msw/makefile.dos
View File

@@ -165,7 +165,7 @@ COMMONOBJS = \
$(COMMDIR)\zipstrm.obj \
$(COMMDIR)\zstream.obj
MSWOBJS = $(MSWDIR)\accel.obj \
MSWOBJS1 = $(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
$(MSWDIR)\bitmap.obj \
$(MSWDIR)\bmpbuttn.obj \
@@ -215,8 +215,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\nativdlg.obj \
$(MSWDIR)\ownerdrw.obj \
$(MSWDIR)\palette.obj \
$(MSWDIR)\pen.obj \
$(MSWDIR)\penwin.obj \
$(MSWDIR)\pen.obj
MSWOBJS2 = $(MSWDIR)\penwin.obj \
$(MSWDIR)\printdlg.obj \
$(MSWDIR)\printwin.obj \
$(MSWDIR)\radiobox.obj \
@@ -245,22 +246,12 @@ MSWOBJS = $(MSWDIR)\accel.obj \
# $(OLEDIR)\xpmhand \
# $(OLEDIR)\pnghand \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS1) $(MSWOBJS2)
# Normal, static library
all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib
all: $(DUMMYOBJ) $(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib
# $(WXDIR)\lib\wx.lib: dummy.obj $(OBJECTS) $(PERIPH_LIBS)
# -erase $(LIBTARGET)
# lib /PAGESIZE:128 @<<
# $(LIBTARGET)
# y
# $(OBJECTS) $(PERIPH_LIBS)
# nul
# ;
# <<
$(WXDIR)\lib\wx1.lib: $(COMMONOBJS) $(PERIPH_LIBS)
-erase $(WXDIR)\lib\wx1.lib
lib /PAGESIZE:128 @<<
@@ -281,12 +272,22 @@ nul
;
<<
$(WXDIR)\lib\wx3.lib: $(MSWOBJS)
$(WXDIR)\lib\wx3.lib: $(MSWOBJS1)
-erase $(WXDIR)\lib\wx3.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx3.lib
y
$(MSWOBJS)
$(MSWOBJS1)
nul
;
<<
$(WXDIR)\lib\wx4.lib: $(MSWOBJS2)
-erase $(WXDIR)\lib\wx4.lib
lib /PAGESIZE:128 @<<
$(WXDIR)\lib\wx4.lib
y
$(MSWOBJS2)
nul
;
<<
@@ -477,9 +478,9 @@ $(MSWDIR)/gdiobj.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(MSWDIR)/gsocket.obj: $*.$(SRCSUFF)
$(MSWDIR)/gsocket.obj: $*.c
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
$(CPPFLAGS2) /Fo$@ /c $*.c
<<
$(MSWDIR)/helpwin.obj: $*.$(SRCSUFF)

10
src/msw/makefile.sc
View File

@@ -143,7 +143,7 @@ COMMONOBJS = \
MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\app.obj \
$(MSWDIR)\automtn.obj \
$(MSWDIR)\ole\automtn.obj \
$(MSWDIR)\bitmap.obj \
$(MSWDIR)\bmpbuttn.obj \
$(MSWDIR)\brush.obj \
@@ -172,8 +172,8 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\dibutils.obj \
$(MSWDIR)\dirdlg.obj \
$(MSWDIR)\dragimag.obj \
$(MSWDIR)\dropsrc.obj \
$(MSWDIR)\droptgt.obj \
$(MSWDIR)\ole\dropsrc.obj \
$(MSWDIR)\ole\droptgt.obj \
$(MSWDIR)\filedlg.obj \
$(MSWDIR)\font.obj \
$(MSWDIR)\fontdlg.obj \
@@ -194,7 +194,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\minifram.obj \
$(MSWDIR)\msgdlg.obj \
$(MSWDIR)\nativdlg.obj \
$(MSWDIR)\oleutils.obj \
$(MSWDIR)\ole\oleutils.obj \
$(MSWDIR)\ownerdrw.obj \
$(MSWDIR)\palette.obj \
$(MSWDIR)\pen.obj \
@@ -227,7 +227,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
$(MSWDIR)\tooltip.obj \
$(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \
$(MSWDIR)\uuid.obj \
$(MSWDIR)\ole\uuid.obj \
$(MSWDIR)\wave.obj \
$(MSWDIR)\window.obj \
$(MSWDIR)\xpmhand.obj

7
src/msw/menu.cpp
View File

@@ -261,7 +261,14 @@ void wxMenu::Append(wxMenuItem *pItem)
{
// menu is just a normal string (passed in data parameter)
flags |= MF_STRING;
// Don't know what the correct cast should be, but it doesn't
// compile in BC++/16-bit without this cast.
#if !defined(__WIN32__)
pData = (char*) (const char*) label;
#else
pData = label;
#endif
}
if ( !::AppendMenu(GetHmenu(), flags, id, pData) )

6
src/msw/menuitem.cpp
View File

@@ -203,7 +203,13 @@ void wxMenuItem::SetName(const wxString& strName)
#endif //owner drawn
{
flagsOld |= MF_STRING;
// Don't know what the correct cast should be, but it doesn't
// compile in BC++/16-bit without this cast.
#if !defined(__WIN32__)
data = (char*) (const char*) strName;
#else
data = strName;
#endif
}
if ( ::ModifyMenu(hMenu, id,

6
src/msw/utils.cpp
View File

@@ -482,7 +482,13 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
{
if (file != wxT(""))
// Don't know what the correct cast should be, but it doesn't
// compile in BC++/16-bit without this cast.
#if !defined(__WIN32__)
return (WritePrivateProfileString((const char*) section, (const char*) entry, (const char*) value, (const char*) file) != 0);
#else
return (WritePrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)value, (LPCTSTR)WXSTRINGCAST file) != 0);
#endif
else
return (WriteProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)WXSTRINGCAST value) != 0);
}