Misc. fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 7dacd802e9295f38138a36d91959afcd589ba337..bf429ec799aaf5b69b20c9c5e7407425fe552ccd 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -689,3 +689,15 @@ samples/dde/*.png
 samples/dde/*.ico
 samples/dde/*.txt
 
+samples/scroll/*.cpp
+samples/scroll/*.h
+samples/scroll/makefile*
+samples/scroll/*.rc
+samples/scroll/*.def
+samples/scroll/*.bmp
+samples/scroll/*.xpm
+samples/scroll/*.xbm
+samples/scroll/*.png
+samples/scroll/*.ico
+samples/scroll/*.txt
+

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 68bb8fefe90a8132171b8cfb8eab02c4b508800f..16cb39b624c8d9514c0436c166f06c24951f1a9d 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -74,6 +74,8 @@ samples/wxpoem/Makefile.in
 samples/wxpoem/Makefile
 samples/wxsocket/Makefile.in
 samples/wxsocket/Makefile
+samples/scroll/Makefile.in
+samples/scroll/Makefile
 src/Makefile.in
 src/Makefile
 utils/ogl/samples/ogledit/Makefile.in

diff --git a/docs/changes.txt b/docs/changes.txt
index 807a411a0608f4967530931a1a1d08c72df07bb8..54536922364ea46ecc6476c60e35618bc93e61fc 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,22 +1,30 @@
 wxWindows 2 Change Log
 ----------------------
 
-2.0.2, March ?? 1999
----------------------
+2.1.0, b4, May 9th 1999
+-----------------------
 
 wxGTK:
 
+- JPEG support added.
+- Many fixes and changes not thought worth mentioning in this file :-)
 
 wxMSW:
 
 - wxNotebook changes: can add image only; wxNB_FIXEDWIDTH added;
   SetTabSize added.
+- JPEG support added.
+- Fixes for Cygwin compilation.
+- Added wxGA_SMOOTH and wxFRAME_FLOAT_ON_PARENT styles.
+- Many fixes people didn't tell this file about.
 
 wxMotif:
 
 
 General:
 
+- Some changes for Unicode support, including wxchar.h/cpp.
+
 
 2.0.1 (release), March 1st 1999
 -------------------------------

diff --git a/include/wx/string.h b/include/wx/string.h
index 442cd0fee0484a6d7645bd4893e3d9c361d88f14..3e8567d18f6a88ce0b51c46b5e2693e97b210f43 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -176,24 +176,9 @@ class WXDLLEXPORT wxMBConv
  public:
   virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
   virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
-  const wxWCharBuffer cMB2WC(const char *psz) const
-    {
-      if (psz) {
-        size_t nLen = MB2WC((wchar_t *) NULL, psz, 0);
-        wxWCharBuffer buf(nLen);
-        MB2WC(WCSTRINGCAST buf, psz, nLen);
-        return buf;
-      } else return wxWCharBuffer((wchar_t *) NULL);
-    }
-  const wxCharBuffer cWC2MB(const wchar_t *psz) const
-    {
-      if (psz) {
-        size_t nLen = WC2MB((char *) NULL, psz, 0);
-        wxCharBuffer buf(nLen);
-        WC2MB(MBSTRINGCAST buf, psz, nLen);
-        return buf;
-      } else return wxCharBuffer((char *) NULL);
-    }
+  // No longer inline since BC++ complains.
+  const wxWCharBuffer cMB2WC(const char *psz) const;
+  const wxCharBuffer cWC2MB(const wchar_t *psz) const;
 #if wxUSE_UNICODE
   const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); }
   const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); }
@@ -264,6 +249,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 #endif
 #else//!wxUSE_WCHAR_T
 class WXDLLEXPORT wxMBConv {
+public:
   const char* cMB2WX(const char *psz) const { return psz; }
   const char* cWX2MB(const char *psz) const { return psz; }
 };

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 48aeb4dc2f9a5ccc6a83f17274af055703dd81b7..96db64a2244ee4d2a08cb365ec9b44168cf7619e 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -449,7 +449,16 @@ size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *psz, size_t n);
 #define wxWC2WX wxWC2MB
 #define wxWX2WC wxMB2WC
 #endif
+#else
+// No wxUSE_WCHAR_T: we have to do something (JACS)
+#define wxMB2WC wxStrncpy
+#define wxWC2MB wxStrncpy
+#define wxMB2WX wxStrncpy
+#define wxWX2MB wxStrncpy
+#define wxWC2WX wxWC2MB
+#define wxWX2WC wxMB2WC
 #endif
+
 bool WXDLLEXPORT wxOKlibc(); // for internal use
 
 // if libc versions are not available, use replacements defined in wxchar.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7ebd31772944227db30811f093417f5c22d934b0..f7ce5fafaea5ebeae6c92cab23a6cd76212ddeac 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -274,6 +274,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
 
 #else
 
+#if wxUSE_WCHAR_T
 // from wide string
 wxString::wxString(const wchar_t *pwz)
 {
@@ -289,6 +290,7 @@ wxString::wxString(const wchar_t *pwz)
     Init();
   }
 }
+#endif
 
 #endif
 
@@ -495,12 +497,14 @@ wxString& wxString::operator=(const unsigned char* psz)
   return *this;
 }
 
+#if wxUSE_WCHAR_T
 wxString& wxString::operator=(const wchar_t *pwz)
 {
   wxString str(pwz);
   *this = str;
   return *this;
 }
+#endif
 
 #endif
 
@@ -2190,3 +2194,27 @@ size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 }
 
 #endif//wxUSE_WCHAR_T
+
+#if wxUSE_WCHAR_T
+const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
+    {
+      if (psz) {
+        size_t nLen = MB2WC((wchar_t *) NULL, psz, 0);
+        wxWCharBuffer buf(nLen);
+        MB2WC(WCSTRINGCAST buf, psz, nLen);
+        return buf;
+      } else return wxWCharBuffer((wchar_t *) NULL);
+    }
+
+const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *psz) const
+    {
+      if (psz) {
+        size_t nLen = WC2MB((char *) NULL, psz, 0);
+        wxCharBuffer buf(nLen);
+        WC2MB(MBSTRINGCAST buf, psz, nLen);
+        return buf;
+      } else return wxCharBuffer((char *) NULL);
+    }
+
+#endif//wxUSE_WCHAR_T
+

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 77acee38f627312dc34143700b60b1465895c76c..5f879ff864a3dd08e9ff6d4a5b94db854851d23d 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 !include $(WXDIR)\src\makeb32.env
 
-LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib
+LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg
 
 !if "$(FINAL)" == "0"
 LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 45f59decce90078c6d7d8463863215b797bc3c5a..8b3eb69fe5568efd429b8d422e2b43325fc08fde 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -50,9 +50,9 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
-PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
-PERIPH_TARGET=zlib png $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)
+PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\jpeg.lib $(PERIPH_LIBS)
+PERIPH_TARGET=zlib png jpeg $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png clean_jpeg $(PERIPH_CLEAN_TARGET)
 
 !if "$(DLL)" == "0"
 DUMMY=dummy
@@ -112,6 +112,7 @@ COMMONOBJS = \
   $(MSWDIR)\image.obj \
   $(MSWDIR)\imagpng.obj \
   $(MSWDIR)\imagjpeg.obj \
+  $(MSWDIR)\imaggif.obj \
   $(MSWDIR)\intl.obj \
   $(MSWDIR)\ipcbase.obj \
   $(MSWDIR)\log.obj \
@@ -512,6 +513,8 @@ $(MSWDIR)\imagpng.obj:     $(COMMDIR)\imagpng.$(SRCSUFF)
 
 $(MSWDIR)\imagjpeg.obj:     $(COMMDIR)\imagjpeg.$(SRCSUFF)
 
+$(MSWDIR)\imaggif.obj:     $(COMMDIR)\imaggif.$(SRCSUFF)
+
 $(MSWDIR)\image.obj:     $(COMMDIR)\image.$(SRCSUFF)
 
 $(MSWDIR)\intl.obj:     $(COMMDIR)\intl.$(SRCSUFF)
@@ -699,6 +702,16 @@ clean_zlib:
         make -f makefile.b32 clean
         cd $(WXDIR)\src\msw
 
+jpeg:    $(CFG)
+        cd $(WXDIR)\src\jpeg
+        make -f makefile.b32 
+        cd $(WXDIR)\src\msw
+
+clean_jpeg:
+        cd $(WXDIR)\src\jpeg
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+
 $(CFG): makefile.b32
        copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index fe713b0eaa1aa1092cb8fe1575ec2f70735bd911..908bb54ae86c9bd0e513dd3f955bfb508f5da533 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -263,7 +263,7 @@ MSWOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
 
 # Normal, static library
-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET)
+all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D
 
@@ -412,6 +412,16 @@ clean_zlib:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
+jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) all
+    cd $(WXDIR)\src\msw
+
+clean_jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+
 xpm:
     cd $(WXDIR)\src\xpm
     nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
@@ -427,7 +437,7 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase ..\..\lib\wx200.dll