Applied patch [ 594623 ] FL: No Taskbar entry for tool windows

and also replaced -with-iodbc with -with-odbc in the docs.

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

diff --git a/contrib/src/fl/controlbar.cpp b/contrib/src/fl/controlbar.cpp
index 9c00fed379f1dacb42752d521f82db3ac2ecbf0c..afe63e5af0990485fdfcac11a3917c00bcd93e67 100644 (file)
--- a/contrib/src/fl/controlbar.cpp
+++ b/contrib/src/fl/controlbar.cpp
@@ -896,7 +896,9 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
         pMiniFrm->Create( &GetParentFrame(), -1, pBar->mName, 
                           wxPoint( 50,50 ),
                           wxSize ( 0, 0  ),
-                          wxFRAME_FLOAT_ON_PARENT  |  wxFRAME_TOOL_WINDOW
+                          wxFRAME_FLOAT_ON_PARENT |
+                          wxFRAME_TOOL_WINDOW |
+                          wxFRAME_NO_TASKBAR
                         );
 
         pMiniFrm->SetClient( pBar->mpBarWnd );

diff --git a/docs/latex/wx/tdb.tex b/docs/latex/wx/tdb.tex
index 92cd1fec51f4783543c06b4ea0f93d450e7eaf22..449efdbfc334b000442af3d4562793da4f5124f2 100644 (file)
--- a/docs/latex/wx/tdb.tex
+++ b/docs/latex/wx/tdb.tex
@@ -316,7 +316,7 @@ You cannot compile the wxODBC classes under Win16 - sorry.
 \normalbox{MORE TO COME}
 
 {\it Under Unix}
---with-iodbc flag for configure
+--with-odbc flag for configure
 
 \normalbox{MORE TO COME}