patches from Ricky Gonzales <gonzales@pyramid3.net>:

1. BC++ 5.5 compilation/building fixes
2. wxMSW listctrl will use correct ILC_COLOR flag depending on current display
   depth
3. wxFrame::Show() argument is TRUE by default undet GTK/Motif too

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 582554c7ef94ca82ecbabe1ad371a02c68cfcc0e..34cb29433b0036d9f9ae3c03f40a6ea20e3ca7d7 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -87,7 +87,7 @@ public:
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 

-    virtual bool Show(bool show);
+    virtual bool Show(bool show = TRUE);

 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 582554c7ef94ca82ecbabe1ad371a02c68cfcc0e..34cb29433b0036d9f9ae3c03f40a6ea20e3ca7d7 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -87,7 +87,7 @@ public:
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
 

-    virtual bool Show(bool show);
+    virtual bool Show(bool show = TRUE);

 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 7eef0ba08b450e4610a75f986c64e6e176e9dac1..e3e1e553ea8e1551f26e19dfe14e7e583d46b993 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -43,7 +43,7 @@ public:
 
     virtual ~wxFrame();
 
 
     virtual ~wxFrame();
 

-    bool Show(bool show);
+    virtual bool Show(bool show = TRUE);

 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);
 
     // Set menu bar
     void SetMenuBar(wxMenuBar *menu_bar);

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index e1928cc532c1d6df189bce13655f2226485487cd..bc36ba9125173e8e9d16f75628e7b9275d0972b0 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -25,7 +25,7 @@
 #include "wx/generic/imaglist.h"
 
 #ifndef wxUSE_GENERIC_LIST_EXTENSIONS
 #include "wx/generic/imaglist.h"
 
 #ifndef wxUSE_GENERIC_LIST_EXTENSIONS

-#define wxUSE_GENERIC_LIST_EXTENSIONS 0
+#define wxUSE_GENERIC_LIST_EXTENSIONS 1

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

diff --git a/src/jpeg/jmorecfg.h b/src/jpeg/jmorecfg.h
index a8fc0e78928b5e7e7f0e00c29362b12be36e471b..2733047bac28d484ffedb0c1c0b5f5c86b82e0c7 100644 (file)
--- a/src/jpeg/jmorecfg.h
+++ b/src/jpeg/jmorecfg.h
@@ -158,12 +158,12 @@ typedef short INT16;
 /* INT32 must hold at least signed 32-bit values. */
 
 /* Modified JACS 23/4/99. 1200 means VC++ 6 */
 /* INT32 must hold at least signed 32-bit values. */
 
 /* Modified JACS 23/4/99. 1200 means VC++ 6 */

-#if !defined(XMD_H) && !(_MSC_VER >= 1200)                     /* X11/xmd.h correctly defines INT32 */
+#if !defined(XMD_H) && !(_MSC_VER >= 1200) && !(__BORLANDC__ >= 0x550)  /* X11/xmd.h correctly defines INT32 */

 typedef long INT32;
 #endif
 
 /* Added JACS 23/4/99, to get INT32 definition */
 typedef long INT32;
 #endif
 
 /* Added JACS 23/4/99, to get INT32 definition */

-#if (_MSC_VER >= 1200)
+#if (_MSC_VER >= 1200) || (__BORLANDC__ >= 0x550)

 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

diff --git a/src/makeb32.env b/src/makeb32.env
index 145d7e611e9604458ae4851ae6b63ebc0d496da8..3c90826c45e05f495ab78b6b33925517ed4e5882 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -7,8 +7,9 @@ WXLIBDIR2 = $(WXDIR)\contrib\lib
 WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 
 WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 

-# This should be changed to ilink32 for C++Builder 4 and above
-LINK=tlink32
+# This should be changed to tlink32 if ilink32 is not available
+# Available on C++ 5.02 and above
+LINK=ilink32

 
 !ifndef FINAL
 FINAL=0
 
 !ifndef FINAL
 FINAL=0

diff --git a/src/makeprog.b32 b/src/makeprog.b32
index b51ac397b92f449fec0d518483a2d0cee775af33..414ac24c4abdbc49b4f88972380e6d9481dd1fff 100644 (file)
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -16,11 +16,11 @@ WXDIR = $(WXWIN)
 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
 
 !if "$(FINAL)" == "0"
 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
 
 !if "$(FINAL)" == "0"

-LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)

 OPT = -Od
 DEBUG_FLAGS= -v
 !else
 OPT = -Od
 DEBUG_FLAGS= -v
 !else

-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib $(EXTRALINKFLAGS)
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)

 OPT = -Od
 DEBUG_FLAGS =
 !endif
 OPT = -Od
 DEBUG_FLAGS =
 !endif

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 89ff4b11ecf5604da1a62b6aba46a9c6689818ff..380f2114504035b5f8653566c4608aab7668a68d 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -82,7 +82,16 @@ wxImageList::wxImageList()
 // Creates an image list
 bool wxImageList::Create(int width, int height, bool mask, int initial)
 {
 // Creates an image list
 bool wxImageList::Create(int width, int height, bool mask, int initial)
 {

-    UINT flags = 0; // TODO shouldallow to specify ILC_COLORxxx here
+    UINT flags = 0;
+
+    // set appropriate color depth
+    int dd = wxDisplayDepth();
+    if (dd <= 4)       flags |= ILC_COLOR;     // 16 color
+    else if (dd <= 8)  flags |= ILC_COLOR8;    // 256 color
+    else if (dd <= 16) flags |= ILC_COLOR16;   // 64k hi-color
+    else if (dd <= 24) flags |= ILC_COLOR24;   // 16m truecolor
+    else if (dd <= 32) flags |= ILC_COLOR32;   // 16m truecolor
+

     if ( mask )
         flags |= ILC_MASK;
 
     if ( mask )
         flags |= ILC_MASK;