From 50c375d311ac4cefbf1ae1d11e19c9e7c00a873e Mon Sep 17 00:00:00 2001 From: David Webster Date: Tue, 26 Oct 1999 04:38:15 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/menuitem.h | 3 -- samples/minimal/makefile.vc | 2 +- src/jpeg/MAKEFILE.VA | 10 ++-- src/jpeg/jmorecfg.h | 24 +++++----- src/jpeg/jpeglib.h | 28 +++++------ src/makelib.vc | 2 +- src/makeprog.vc | 2 +- src/makevc.env | 2 +- src/msw/choice.cpp | 6 ++- src/msw/listbox.cpp | 7 +-- src/msw/ole/droptgt.cpp | 5 +- src/os2/makefile.va | 95 ++++++++++++++++++++++++++----------- src/png/MAKEFILE.VA | 12 ++--- src/xpm/MAKEFILE.VA | 8 ++-- src/zlib/MAKEFILE.VA | 14 +++--- 15 files changed, 130 insertions(+), 90 deletions(-) diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index 9336cca57f..167812d557 100644 --- a/include/wx/os2/menuitem.h +++ b/include/wx/os2/menuitem.h @@ -33,9 +33,6 @@ // constants // ---------------------------------------------------------------------------- -// id for a separator line in the menu (invalid for normal item) -#define ID_SEPARATOR (-1) - // ---------------------------------------------------------------------------- // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // ---------------------------------------------------------------------------- diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc index 35aefc474c..ae49d75668 100644 --- a/samples/minimal/makefile.vc +++ b/samples/minimal/makefile.vc @@ -9,7 +9,7 @@ # Use FINAL=1 argument to nmake to build final version with no debug info. # Set WXDIR for your system -WXDIR = $(WXWIN) +WXDIR = j:\dev\wx2\wxWindows PROGRAM=minimal OBJECTS = $(PROGRAM).obj diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA index b25a74a591..b4926a384f 100644 --- a/src/jpeg/MAKEFILE.VA +++ b/src/jpeg/MAKEFILE.VA @@ -13,13 +13,13 @@ OBJSUFF=obj SRCSUFF=cpp -OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /D__WXPM__ /Ss /Q /N100 +OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = j:\dev\wx2\wxWindows OS2JPEGDIR=$(WXDIR)\src\jpeg OS2JPEGINC=$(WINJPEGDIR) @@ -292,9 +292,9 @@ $(WXDIR)\lib\os2jpeg.lib: \ del $(TEMP2TGT) clean: - del *.obj - del *.exe - del *.lib + del $(OS2JPEGLIB) + erase /N $(OS2JPEGDIR)\$D + rd $(OS2JPEGDIR)\$D cleanall: clean diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h index 3a774dc7fb..a8fc0e7892 100644 --- a/src/jpeg/jmorecfg.h +++ b/src/jpeg/jmorecfg.h @@ -186,16 +186,16 @@ typedef unsigned int JDIMENSION; * or code profilers that require it. */ -//#if defined(__VISAGECPP__) -///* a function called through method pointers: */ -//#define METHODDEF(type) static type _Optlink -///* a function used only in its module: */ -//#define LOCAL(type) static type _Optlink -///* a function referenced thru EXTERNs: */ -//#define GLOBAL(type) type -///* a reference to a GLOBAL function: */ -//#define EXTERN(type) extern type _Optlink -//#else +#if defined(__VISAGECPP__) && !defined(JPEGLOCAL) /* need this for /common/imagjpeg.obj but not loclly */ +/* a function called through method pointers: */ +#define METHODDEF(type) static type _Optlink +/* a function used only in its module: */ +#define LOCAL(type) static type _Optlink +/* a function referenced thru EXTERNs: */ +#define GLOBAL(type) type +/* a reference to a GLOBAL function: */ +#define EXTERN(type) extern type _Optlink +#else /* a function called through method pointers: */ #define METHODDEF(type) static type /* a function used only in its module: */ @@ -204,9 +204,7 @@ typedef unsigned int JDIMENSION; #define GLOBAL(type) type /* a reference to a GLOBAL function: */ #define EXTERN(type) extern type -//#endif - - +#endif /* This macro is used to declare a "method", that is, a function pointer. * We want to supply prototype parameters if the compiler can cope. diff --git a/src/jpeg/jpeglib.h b/src/jpeg/jpeglib.h index b7a0ec4e98..6539c31271 100644 --- a/src/jpeg/jpeglib.h +++ b/src/jpeg/jpeglib.h @@ -128,9 +128,9 @@ typedef struct { /* The decompressor output side may not use these variables. */ int dc_tbl_no; /* DC entropy table selector (0..3) */ int ac_tbl_no; /* AC entropy table selector (0..3) */ - + /* Remaining fields should be treated as private by applications. */ - + /* These values are computed during compression or decompression startup: */ /* Component's size in DCT blocks. * Any dummy blocks added to complete an MCU are not counted; therefore @@ -298,14 +298,14 @@ struct jpeg_compress_struct { jpeg_component_info * comp_info; /* comp_info[i] describes component that appears i'th in SOF */ - + JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS]; /* ptrs to coefficient quantization tables, or NULL if not defined */ - + JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS]; JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS]; /* ptrs to Huffman coding tables, or NULL if not defined */ - + UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */ UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */ UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */ @@ -345,7 +345,7 @@ struct jpeg_compress_struct { UINT16 X_density; /* Horizontal pixel density */ UINT16 Y_density; /* Vertical pixel density */ boolean write_Adobe_marker; /* should an Adobe marker be written? */ - + /* State variable: index of next scanline to be written to * jpeg_write_scanlines(). Application may use this to control its * processing loop, e.g., "while (next_scanline < image_height)". @@ -370,7 +370,7 @@ struct jpeg_compress_struct { * There are v_samp_factor * DCTSIZE sample rows of each component in an * "iMCU" (interleaved MCU) row. */ - + /* * These fields are valid during any one scan. * They describe the components and MCUs actually appearing in the scan. @@ -378,10 +378,10 @@ struct jpeg_compress_struct { int comps_in_scan; /* # of JPEG components in this scan */ jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN]; /* *cur_comp_info[i] describes component that appears i'th in SOS */ - + JDIMENSION MCUs_per_row; /* # of MCUs across the image */ JDIMENSION MCU_rows_in_scan; /* # of MCU rows in the image */ - + int blocks_in_MCU; /* # of DCT blocks per MCU */ int MCU_membership[C_MAX_BLOCKS_IN_MCU]; /* MCU_membership[i] is index in cur_comp_info of component owning */ @@ -652,7 +652,7 @@ struct jpeg_error_mgr { #define JMSG_LENGTH_MAX 200 /* recommended size of format_message buffer */ /* Reset error state variables at start of a new image */ JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo)); - + /* The message ID code and any parameters are saved here. * A message can have one string parameter or up to 8 int parameters. */ @@ -662,11 +662,11 @@ struct jpeg_error_mgr { int i[8]; char s[JMSG_STR_PARM_MAX]; } msg_parm; - + /* Standard state variables for error facility */ - + int trace_level; /* max msg_level that will be displayed */ - + /* For recoverable corrupt-data errors, we emit a warning message, * but keep going unless emit_message chooses to abort. emit_message * should count warnings in num_warnings. The surrounding application @@ -824,7 +824,7 @@ typedef JMETHOD(boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo)); /* Short forms of external names for systems with brain-damaged linkers. * We shorten external names to be unique in the first six letters, which * is good enough for all known systems. - * (If your compiler itself needs names to be unique in less than 15 + * (If your compiler itself needs names to be unique in less than 15 * characters, you are out of luck. Get a better compiler.) */ diff --git a/src/makelib.vc b/src/makelib.vc index 8b5b459d80..f4ce264a9d 100644 --- a/src/makelib.vc +++ b/src/makelib.vc @@ -10,7 +10,7 @@ # info # Set WXDIR for your system -WXDIR = $(WXWIN) +WXDIR = j:\dev\wx2\wxWindows !include $(WXDIR)\src\makevc.env diff --git a/src/makeprog.vc b/src/makeprog.vc index b3eb9138b2..bb9ae460b5 100644 --- a/src/makeprog.vc +++ b/src/makeprog.vc @@ -11,7 +11,7 @@ # info # Set WXDIR for your system -WXDIR = $(WXWIN) +WXDIR = j:\dev\wx2\wxWindows WXUSINGDLL=0 diff --git a/src/makevc.env b/src/makevc.env index 3ec3459411..0c0d1240d8 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -43,7 +43,7 @@ WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib sh comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2 # Change this to your WXWIN directory -WXDIR=$(WXWIN) +WXDIR=j:\dev\wx2\wxWindows WXSRC=$(WXDIR)\src\msw WXINC=$(WXDIR)\include diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index c6a9f7909f..0f7d86ec3b 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -85,10 +85,12 @@ bool wxChoice::Create(wxWindow *parent, return TRUE; } +/* wxChoice::~wxChoice() { Free(); } +*/ // ---------------------------------------------------------------------------- // adding/deleting items to/from the list @@ -119,11 +121,12 @@ void wxChoice::Delete(int n) void wxChoice::Clear() { - Free(); +// Free(); SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0); } +/* void wxChoice::Free() { if ( HasClientObjectData() ) @@ -135,6 +138,7 @@ void wxChoice::Free() } } } +*/ // ---------------------------------------------------------------------------- // selection diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 5b2e30ab63..7220cf5ef1 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -230,7 +230,7 @@ bool wxListBox::Create(wxWindow *parent, wxListBox::~wxListBox() { - Free(); +// Free(); } void wxListBox::SetupColours() @@ -348,7 +348,7 @@ int wxListBox::FindString(const wxString& s) const void wxListBox::Clear() { - Free(); +// Free(); ListBox_ResetContent(GetHwnd()); @@ -356,6 +356,7 @@ void wxListBox::Clear() SetHorizontalExtent(); } +/* void wxListBox::Free() { #if wxUSE_OWNER_DRAWN @@ -378,7 +379,7 @@ void wxListBox::Free() } } } - +*/ void wxListBox::SetSelection(int N, bool select) { wxCHECK_RET( N >= 0 && N < m_noItems, diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index b6d353d98c..67825f8569 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -260,11 +260,14 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource, // and now it has the data wxDragResult rc = ConvertDragEffectToResult(GetDropEffect(grfKeyState)); - rc = m_pTarget->OnData(pt.x, pt.y, rc); + m_pTarget->OnData(pt.x, pt.y);//, rc); +/* if ( wxIsDragResultOk(rc) ) { // operation succeeded *pdwEffect = ConvertDragResultToEffect(rc); } +*/ + //else: *pdwEffect is already DROPEFFECT_NONE } //else: OnDrop() returned FALSE, no need to copy data diff --git a/src/os2/makefile.va b/src/os2/makefile.va index e10f25fdc6..d2f1609f22 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -52,6 +52,18 @@ COMMDIR=$(WXDIR)\src\common OS2DIR=$(WXDIR)\src\os2 HTMLDIR = $(WXDIR)\src\html +!if [md $(COMMDIR)\$D] +!endif + +!if [md $(OS2DIR)\$D] +!endif + +!if [md $(GENDIR)\$D] +!endif + +!if [md $(HTMLDIR)\$D] +!endif + {..\generic}.cpp{..\generic\$D}.obj: @echo $< icc @<< @@ -549,7 +561,7 @@ HTMLLIBOBJS = \ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS) # Normal, static library -all: $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET) +all: $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET) dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D @@ -557,21 +569,6 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D test: $(OS2DIR)\$D\wave.obj test2: ..\common\Debug\config.obj -$D: - md $D - -$(COMMDIR)\$D: - md $(COMMDIR)\$D - -$(OS2DIR)\$D: - md $(OS2DIR)\$D - -$(GENDIR)\$D: - md $(GENDIR)\$D - -$(HTMLDIR)\$D: - md $(HTMLDIR)\$D - $(COMLIBOBJS1): copy ..\common\$D\appcmn.obj copy ..\common\$D\choiccmn.obj @@ -972,20 +969,60 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h $(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c << +png: + cd $(WXDIR)\src\png + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_png: + cd $(WXDIR)\src\png + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + +zlib: + cd $(WXDIR)\src\zlib + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_zlib: + cd $(WXDIR)\src\zlib + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + +jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_jpeg: + cd $(WXDIR)\src\jpeg + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + +xpm: + cd $(WXDIR)\src\xpm + nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) + cd $(WXDIR)\src\os2 + +clean_xpm: + cd $(WXDIR)\src\xpm + nmake -f makefile.va clean + cd $(WXDIR)\src\os2 + clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm - -erase $(LIBTARGET) - -erase ..\..\lib\wx200.dll - -erase ..\..\lib\wx200.lib - -erase $(GENDIR)\$D\*.obj - -erase $(COMMDIR)\$D\*.obj - -erase $(COMMDIR)\\y_tab.c - -erase $(COMMDIR)\lex_yy.c - -erase $(OS2DIR)\$D\*.obj - -rmdir $(D) - -rmdir ..\generic\$(D) - -rmdir ..\common\$(D) - -rmdir ..\html\$(D) - -rmdir ..\os2\$(D) + del $(LIBTARGET) + erase /N ..\..\lib\wx200.dll + erase /N ..\..\lib\wx200.lib + erase /N $(GENDIR)\$D\*.obj + erase /N $(COMMDIR)\$D\*.obj + erase /N $(COMMDIR)\\y_tab.c + erase /N $(COMMDIR)\lex_yy.c + erase /N $(OS2DIR)\$D\*.obj + rd $(D) + rd ..\generic\$(D) + rd ..\common\$(D) + rd ..\html\$(D) + rd ..\os2\$(D) cleanall: clean diff --git a/src/png/MAKEFILE.VA b/src/png/MAKEFILE.VA index e8fbfa0747..ca5e78db75 100644 --- a/src/png/MAKEFILE.VA +++ b/src/png/MAKEFILE.VA @@ -57,6 +57,9 @@ LINK_DEBUG_FLAGS=/RELEASE CRTFLAG=/Gm /Gd !endif +!if [md $(OS2PNGDIR)\$D] +!endif + CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG) {..\png}.c{..\png\$D}.obj: @@ -84,9 +87,6 @@ OBJECTS = \ all: $(OS2PNGLIB) -$(OS2PNGDIR)\$D: - md $(OS2PNGDIR)\$D - $(WXDIR)\lib\os2png.lib: $(OBJECTS) touch $(WXDIR)\lib\os2png.lib del $(WXDIR)\lib\os2png.lib @@ -95,9 +95,9 @@ $(WXDIR)\lib\os2png.lib: $(OBJECTS) << clean: - del *.obj - del *.exe - del *.lib + del $(OS2PNGLIB) + erase /N $(OS2PNGDIR)\$D + rd $(OS2PNGDIR)\$D cleanall: clean diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA index f4bd88233c..f3466868c2 100644 --- a/src/xpm/MAKEFILE.VA +++ b/src/xpm/MAKEFILE.VA @@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = j:\dev\wx2\wxWindows OS2XPMDIR=$(WXDIR)\src\xpm OS2XPMINC=$(WINXPMDIR) @@ -98,9 +98,9 @@ $(WXDIR)\lib\os2xpm.lib: $(OBJECTS) << clean: - del *.obj - del *.exe - del *.lib + del $(OS2XPMLIB) + erase /N $(OS2XPMDIR)\$D + rd $(OS2XPMDIR)\$D cleanall: clean diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA index 8322d781f6..3e4fcdf3eb 100644 --- a/src/zlib/MAKEFILE.VA +++ b/src/zlib/MAKEFILE.VA @@ -57,6 +57,9 @@ LINK_DEBUG_FLAGS=/RELEASE CRTFLAG=/Gm /Gd !endif +!if [md $(OS2ZLIBDIR)\$D] +!endif + CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG) {..\zlib}.c{..\zlib\$D}.obj: @@ -81,10 +84,7 @@ OBJECTS = \ ..\zlib\$D\uncompr.obj \ ..\zlib\$D\zutil.obj -all: $(OS2ZLIBDIR)\$D $(OS2ZLIBLIB) - -$(OS2ZLIBDIR)\$D: - md $(OS2ZLIBDIR)\$D +all: $(OS2ZLIBLIB) $(WXDIR)\lib\os2zlib.lib: $(OBJECTS) touch $(WXDIR)\lib\os2zlib.lib @@ -94,9 +94,9 @@ $(WXDIR)\lib\os2zlib.lib: $(OBJECTS) << clean: - del *.obj - del *.exe - del *.lib + del $(OS2ZLIBLIB) + erase /N $(OS2ZLIBDIR)\$D + rd $(OS2ZLIBDIR)\$D cleanall: clean -- 2.45.2