*** 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

@@ -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
 // ----------------------------------------------------------------------------

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

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      $(OS2JPEGLIB)
-        del *.exe
+        erase /N $(OS2JPEGDIR)\$D
-        del *.lib
+        rd       $(OS2JPEGDIR)\$D
 
 cleanall:     clean
 

src/jpeg/jmorecfg.h

@@ -186,16 +186,16 @@ typedef unsigned int JDIMENSION;
  * or code profilers that require it.
  */
 
-//#if defined(__VISAGECPP__)
+#if defined(__VISAGECPP__) && !defined(JPEGLOCAL) /* need this for /common/imagjpeg.obj but not loclly */
-///* a function called through method pointers: */
+/* a function called through method pointers: */
-//#define METHODDEF(type)		static type _Optlink
+#define METHODDEF(type)		static type _Optlink
-///* a function used only in its module: */
+/* a function used only in its module: */
-//#define LOCAL(type)		static type _Optlink
+#define LOCAL(type)		static type _Optlink
-///* a function referenced thru EXTERNs: */
+/* a function referenced thru EXTERNs: */
-//#define GLOBAL(type)		type
+#define GLOBAL(type)		type
-///* a reference to a GLOBAL function: */
+/* a reference to a GLOBAL function: */
-//#define EXTERN(type)		extern type _Optlink
+#define EXTERN(type)		extern type _Optlink
-//#else
+#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.

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
 

src/makeprog.vc

@@ -11,7 +11,7 @@
 # info
 
 # Set WXDIR for your system
-WXDIR = $(WXWIN)
+WXDIR = j:\dev\wx2\wxWindows
 
 WXUSINGDLL=0
 

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

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

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,

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

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)
+        del      $(LIBTARGET)
-        -erase ..\..\lib\wx200.dll
+        erase /N ..\..\lib\wx200.dll
-        -erase ..\..\lib\wx200.lib
+        erase /N ..\..\lib\wx200.lib
-        -erase $(GENDIR)\$D\*.obj
+        erase /N $(GENDIR)\$D\*.obj
-        -erase $(COMMDIR)\$D\*.obj
+        erase /N $(COMMDIR)\$D\*.obj
-        -erase $(COMMDIR)\\y_tab.c
+        erase /N $(COMMDIR)\\y_tab.c
-        -erase $(COMMDIR)\lex_yy.c
+        erase /N $(COMMDIR)\lex_yy.c
-        -erase $(OS2DIR)\$D\*.obj
+        erase /N $(OS2DIR)\$D\*.obj
-        -rmdir $(D)
+        rd       $(D)
-        -rmdir ..\generic\$(D)
+        rd      ..\generic\$(D)
-        -rmdir ..\common\$(D)
+        rd      ..\common\$(D)
-        -rmdir ..\html\$(D)
+        rd      ..\html\$(D)
-        -rmdir ..\os2\$(D)
+        rd      ..\os2\$(D)
 
 cleanall: clean
 

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      $(OS2PNGLIB)
-        del *.exe
+        erase /N $(OS2PNGDIR)\$D
-        del *.lib
+        rd       $(OS2PNGDIR)\$D
 
 cleanall:     clean
 

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      $(OS2XPMLIB)
-        del *.exe
+        erase /N $(OS2XPMDIR)\$D
-        del *.lib
+        rd       $(OS2XPMDIR)\$D
 
 cleanall:     clean
 

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)
+all: $(OS2ZLIBLIB)
-
-$(OS2ZLIBDIR)\$D:
-       md $(OS2ZLIBDIR)\$D
 
 $(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
  touch $(WXDIR)\lib\os2zlib.lib
@@ -94,9 +94,9 @@ $(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
 <<
 
 clean:
-        del *.obj
+        del      $(OS2ZLIBLIB)
-        del *.exe
+        erase /N $(OS2ZLIBDIR)\$D
-        del *.lib
+        rd       $(OS2ZLIBDIR)\$D
 
 cleanall:     clean