Docs.

  Fix DialogEd XOR's.
  Colour does proper RGB value comparison.

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

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index cf349ac5c2c36f1307c1bbeba0871790472c67a2..706b753d4944b1a17fa29a813dc0dea5a953ac66 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -21,9 +21,42 @@ If you want to remove wxWindows on Unix you can do this:
 
 su <type root password>
 make uninstall
 
 su <type root password>
 make uninstall

-ldconfif
+ldconfig

 exit
 
 exit
 

+* The expert case
+-----------------
+
+If you want to do some more serious cross-platform programming
+with wxWindows, such as for GTK and Motif, you can now build
+two complete libraries and use them concurretly. For this end,
+you have to create a directory for each build of wxWindows -
+you may also want to create different versions of wxWindows
+and test them concurrently. Most typically, this would be a
+version configured with --enable-debug_flag and one without.
+Note, that only one build can currenty be installed, so you'd
+have to use local version of the library for that purpose.
+For building three version, one GTK, one Motif and a debug
+version of the GTK source, you'd do this:
+
+md buildmotif
+cd buildmotif
+../configure --with-motif
+make
+cd ..
+
+md buildgtk
+cd buildgtk
+../configure --with-gtk
+make
+cd ..
+
+md buildgtkd
+cd buildgtkd
+../configure --with-gtk --enable-debug
+make
+cd ..
+

 * The most simple errors
 ------------------------
 
 * The most simple errors
 ------------------------
 


@@ -48,10 +81,12 @@ If there is just any way for you to use egcs, use egcs.
 We are sorry, but we cannot fix gcc.
 
 You get immediate segfault when starting any sample
 We are sorry, but we cannot fix gcc.
 
 You get immediate segfault when starting any sample

-or application: This is _always_ due to having compiled
+or application: This is either due to having compiled

 the library with different flags or options than your
 the library with different flags or options than your

-program. Typically you might have the __WXDEBUG__ option
-set for the library but not for your program.
+program - typically you might have the __WXDEBUG__ option
+set for the library but not for your program - or due
+to using a broken compiler (and its optimisation) such
+as GCC 2.8.

 
 * The most simple program
 -------------------------
 
 * The most simple program
 -------------------------


@@ -172,7 +207,8 @@ not been defined. And Make in some circumstances as well...
 * General options
 -------------------
 
 * General options
 -------------------
 

-         !!  DON'T USE YET !!
+The confiugre options have not yet been thoroughly tested
+in wxWindows snapshot 6.

 
 Normally, you won't have to choose a toolkit, because when
 you download wxGTK, it will default to --with-gtk etc. But
 
 Normally, you won't have to choose a toolkit, because when
 you download wxGTK, it will default to --with-gtk etc. But


@@ -186,31 +222,31 @@ toolkit. You must do this by running configure with either of:
 
 The following options handle the kind of library you want to build.
 
 
 The following options handle the kind of library you want to build.
 

-       --with-threads          Compile with thread support. Threads
+       --disable-threads       Compile without thread support. Threads

                                support is also required for the
                                socket code to work.
 
                                support is also required for the
                                socket code to work.
 

-       --without-shared        Do not create shared libraries.
+       --disable-shared        Do not create shared libraries.

 
 

-       --without-optimise      Do not optimise the code. Can
+       --disable-optimise      Do not optimise the code. Can

                                sometimes be useful for debugging
                                and is required on some architectures
                                such as Sun with gcc 2.8.X which
                                would otherwise produce segvs.
 
                                sometimes be useful for debugging
                                and is required on some architectures
                                such as Sun with gcc 2.8.X which
                                would otherwise produce segvs.
 

-       --with-profile          Add profiling info to the object 
+       --enable-profile        Add profiling info to the object 

                                files. Currently broken, I think.
                                
                                files. Currently broken, I think.
                                

-       --with-mem_tracing      Add built-in memory tracing. 
+       --enable-mem_tracing    Add built-in memory tracing. 

                                
                                

-       --with-dmalloc          Use the dmalloc memory debugger.
+       --enable-dmalloc        Use the dmalloc memory debugger.

                                Read more at www.letters.com/dmalloc/
                                
                                Read more at www.letters.com/dmalloc/
                                

-       --with-debug_info       Add debug info to object files and
+       --enable-debug_info     Add debug info to object files and

                                executables for use with debuggers
                                such as gdb (or its many frontends).
 
                                executables for use with debuggers
                                such as gdb (or its many frontends).
 

-       --with-debug_flag       Define __DEBUG__ and __WXDEBUG__ when
+       --enable-debug_flag     Define __DEBUG__ and __WXDEBUG__ when

                                compiling. This enable wxWindows' very
                                useful internal debugging tricks (such
                                as automatically reporting illegal calls)
                                compiling. This enable wxWindows' very
                                useful internal debugging tricks (such
                                as automatically reporting illegal calls)


@@ -221,7 +257,8 @@ The following options handle the kind of library you want to build.
 * Feature Options
 -------------------
 
 * Feature Options
 -------------------
 

-         !!  DON'T USE YET !!
+The confiugre options have not yet been thoroughly tested
+in wxWindows snapshot 6.

 
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be
 
 When producing an executable that is linked statically with wxGTK
 you'll be surprised at its immense size. This can sometimes be


@@ -235,21 +272,21 @@ are
        
        --without-odbc          Disables ODBC code.
        
        
        --without-odbc          Disables ODBC code.
        

-        --without-wxresources   Disables the use of *.wxr type
+        --disable-wxresources   Disables the use of *.wxr type

                                resources.
                
                                resources.
                

-       --without-threads       Disables threads. Will also
+       --disable-threads       Disables threads. Will also

                                disable sockets.
 
                                disable sockets.
 

-       --without-sockets       Disables sockets.
+       --disable-sockets       Disables sockets.

 
 

-       --without-dnd           Disables Drag'n'Drop.
+       --disable-dnd           Disables Drag'n'Drop.

        
        

-       --without-clipboard     Disables Clipboard.
+       --disable-clipboard     Disables Clipboard.

        
        

-       --without-serial        Disables object instance serialiasation.
+       --disable-serial        Disables object instance serialiasation.

        
        

-       --without-streams       Disables the wxStream classes.
+       --disable-streams       Disables the wxStream classes.

        
 Apart from disabling certain features you can very often "strip"
 the program of its debugging information resulting in a significant
        
 Apart from disabling certain features you can very often "strip"
 the program of its debugging information resulting in a significant


@@ -267,7 +304,7 @@ the library by typing:
        make
 
 make yourself some coffee, as it will take some time. On an old
        make
 
 make yourself some coffee, as it will take some time. On an old

-386SX possibly week. During compilation, you'll get a few 
+386SX possibly two weeks. During compilation, you'll get a few 

 warning messages depending in your compiler.
 
 if you want to be more selective, you can change into a specific
 warning messages depending in your compiler.
 
 if you want to be more selective, you can change into a specific

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 5dd853ff8ee1cf0566a7612e7c55b309f98807b8..e3f3a23cf7d3e255f9d17b6677b1dcaa4bff1748 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -10,7 +10,8 @@ Beginning from snapshot 6 wxWindows uses a completely
 new make file system on Unix that uses GNU automake,
 GNU autoconf and GNU autoheader. You do not need these
 programs in order to use the library, but for taking
 new make file system on Unix that uses GNU automake,
 GNU autoconf and GNU autoheader. You do not need these
 programs in order to use the library, but for taking

-part in its development, they are required.
+part in its development, they are required. Read the
+INSTALL.txt file for learning what you can do with it.

 
 More information is available from my homepage at:
 
 
 More information is available from my homepage at:
 

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 9c9eef687d3002f2fa1a10367cddfcff6a03d8c2..51fde80c114a5e9e1743c5170f3a5764fd1b57d0 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -118,7 +118,18 @@ wxColour& wxColour::operator = ( const wxColour& col )
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
 
 bool wxColour::operator == ( const wxColour& col ) const
 {

-    return m_refData == col.m_refData;
+    if (m_refData == col.m_refData) return TRUE;
+    
+    if (!m_refData) return FALSE;
+    if (!col.m_refData) return FALSE;
+    
+    GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
+    GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
+    if (own->red != other->red) return FALSE;
+    if (own->blue != other->blue) return FALSE;
+    if (own->green != other->green) return FALSE;
+    
+    return TRUE;

 }
 
 bool wxColour::operator != ( const wxColour& col) const
 }
 
 bool wxColour::operator != ( const wxColour& col) const

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4d2bc6c47495512d095731fe1ab0809664e6e8e6..cc3d1edb16ea48082c81ca9f52b98d5dd3c907cd 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2582,7 +2582,6 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );

-

     if (sysbg == m_backgroundColour)
     {
         m_backgroundColour = wxNullColour;
     if (sysbg == m_backgroundColour)
     {
         m_backgroundColour = wxNullColour;


@@ -2621,7 +2620,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );

-    if (sysbg == m_foregroundColour)
+    if ( sysbg == m_backgroundColour )

     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();
     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 9c9eef687d3002f2fa1a10367cddfcff6a03d8c2..51fde80c114a5e9e1743c5170f3a5764fd1b57d0 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -118,7 +118,18 @@ wxColour& wxColour::operator = ( const wxColour& col )
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
 
 bool wxColour::operator == ( const wxColour& col ) const
 {

-    return m_refData == col.m_refData;
+    if (m_refData == col.m_refData) return TRUE;
+    
+    if (!m_refData) return FALSE;
+    if (!col.m_refData) return FALSE;
+    
+    GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
+    GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
+    if (own->red != other->red) return FALSE;
+    if (own->blue != other->blue) return FALSE;
+    if (own->green != other->green) return FALSE;
+    
+    return TRUE;

 }
 
 bool wxColour::operator != ( const wxColour& col) const
 }
 
 bool wxColour::operator != ( const wxColour& col) const

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 4d2bc6c47495512d095731fe1ab0809664e6e8e6..cc3d1edb16ea48082c81ca9f52b98d5dd3c907cd 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2582,7 +2582,6 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );

-

     if (sysbg == m_backgroundColour)
     {
         m_backgroundColour = wxNullColour;
     if (sysbg == m_backgroundColour)
     {
         m_backgroundColour = wxNullColour;


@@ -2621,7 +2620,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     }
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );

-    if (sysbg == m_foregroundColour)
+    if ( sysbg == m_backgroundColour )

     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();
     {
         m_backgroundColour = wxNullColour;
         ApplyWidgetStyle();

diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp
index ba3be91fd94fe819d9a00647983c339d3761c7b5..d8c428e47b29d479d5ee963731efe62be76bd6c7 100644 (file)
--- a/utils/dialoged/src/dlghndlr.cpp
+++ b/utils/dialoged/src/dlghndlr.cpp
@@ -784,7 +784,7 @@ void wxResourceEditorControlHandler::OnDragBegin(int x, int y, int WXUNUSED(keys
 
   dc.SetOptimization(FALSE);
 
 
   dc.SetOptimization(FALSE);
 

-  dc.SetLogicalFunction(wxXOR);
+  dc.SetLogicalFunction(wxINVERT);

 
   wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(pen);
 
   wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
   dc.SetPen(pen);


@@ -902,7 +902,7 @@ void wxResourceEditorControlHandler::OnDragContinue(bool WXUNUSED(paintIt), int
     }
     dc.BeginDrawing();
 
     }
     dc.BeginDrawing();
 

-    dc.SetLogicalFunction(wxXOR);
+    dc.SetLogicalFunction(wxINVERT);

     wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
     wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);


@@ -914,7 +914,7 @@ void wxResourceEditorControlHandler::OnDragContinue(bool WXUNUSED(paintIt), int
   else
   {
       dc.BeginDrawing();
   else
   {
       dc.BeginDrawing();

-      dc.SetLogicalFunction(wxXOR);
+      dc.SetLogicalFunction(wxINVERT);

       wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
       dc.SetPen(pen);
       dc.SetBrush(* wxTRANSPARENT_BRUSH);
       wxPen pen(wxColour(0, 0, 0), 1, wxDOT);
       dc.SetPen(pen);
       dc.SetBrush(* wxTRANSPARENT_BRUSH);