assorted files I forgot to commit before

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

diff --git a/docs/html/roadmap.htm b/docs/html/roadmap.htm
index dd252a865a8814139dfca67a348e866506e89131..a96c2b87c43dfefd750ec398d96c08972fc313ae 100644 (file)
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -110,6 +110,7 @@ Release date: ?
 <li>UDP support in wxSocket
 <li>wxPlot
 <li>XML for resource files.
 <li>UDP support in wxSocket
 <li>wxPlot
 <li>XML for resource files.

+<li>Built-in support for configuring key bindings

 </ul>
 
 <P>
 </ul>
 
 <P>


@@ -187,9 +188,7 @@ written generically in wxWindows.
 
 <ul>
 <li>Windows CE port.
 
 <ul>
 <li>Windows CE port.

-<li>Cure bug whereby in a panel within another panel, all buttons become
-default buttons (heavy black border).
-<li>Write a RC->WXR converter.
+<li>Write a RC to WXR converter.

 </ul>
 
 <P>
 </ul>
 
 <P>

diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in
index 0595ae2c3087d0548edc34bce48047d0f1152e43..b8c57fb300186bb521fb82207d41713a742f8cee 100644 (file)
--- a/samples/console/Makefile.in
+++ b/samples/console/Makefile.in
@@ -16,6 +16,7 @@ program_dir = samples/console
 PROGRAM=console
 
 OBJECTS=$(PROGRAM).o
 PROGRAM=console
 
 OBJECTS=$(PROGRAM).o

+DATAFILES=testdata.fc

 
 include ../../src/makeprog.env
 
 
 include ../../src/makeprog.env
 

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index d073cb55119683dd1fc6e31b65f72d84b3edc1f1..b589b8fd9edfc74bfe4de8ce776e8a51666d1b8a 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -33,10 +33,11 @@
 //#define TEST_CMDLINE
 //#define TEST_DIR
 //#define TEST_EXECUTE
 //#define TEST_CMDLINE
 //#define TEST_DIR
 //#define TEST_EXECUTE

+#define TEST_FILECONF

 //#define TEST_LOG
 //#define TEST_LONGLONG
 //#define TEST_MIME
 //#define TEST_LOG
 //#define TEST_LONGLONG
 //#define TEST_MIME

-#define TEST_STRINGS
+//#define TEST_STRINGS

 //#define TEST_THREADS
 //#define TEST_TIME
 
 //#define TEST_THREADS
 //#define TEST_TIME
 


@@ -189,6 +190,69 @@ static void TestExecute()
 
 #endif // TEST_EXECUTE
 
 
 #endif // TEST_EXECUTE
 

+// ----------------------------------------------------------------------------
+// wxFileConfig
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_FILECONF
+
+#include <wx/confbase.h>
+#include <wx/fileconf.h>
+
+static const struct FileConfTestData
+{
+    const wxChar *name;      // value name
+    const wxChar *value;     // the value from the file
+} fcTestData[] =
+{
+    { _T("value1"),                       _T("one") },
+    { _T("value2"),                       _T("two") },
+    { _T("novalue"),                      _T("default") },
+};
+
+static void TestFileConfRead()
+{
+    puts("*** testing wxFileConfig loading/reading ***");
+
+    wxFileConfig fileconf(_T("test"), wxEmptyString,
+                          _T("testdata.fc"), wxEmptyString,
+                          wxCONFIG_USE_RELATIVE_PATH);
+
+    // test simple reading
+    puts("\nReading config file:");
+    wxString defValue(_T("default")), value;
+    for ( size_t n = 0; n < WXSIZEOF(fcTestData); n++ )
+    {
+        const FileConfTestData& data = fcTestData[n];
+        value = fileconf.Read(data.name, defValue);
+        printf("\t%s = %s ", data.name, value.c_str());
+        if ( value == data.value )
+        {
+            puts("(ok)");
+        }
+        else
+        {
+            printf("(ERROR: should be %s)\n", data.value);
+        }
+    }
+
+    // test enumerating the entries
+    puts("\nEnumerating all root entries:");
+    long dummy;
+    wxString name;
+    bool cont = fileconf.GetFirstEntry(name, dummy);
+    while ( cont )
+    {
+        printf("\t%s = %s\n",
+               name.c_str(),
+               fileconf.Read(name.c_str(), _T("ERROR")).c_str());
+
+        cont = fileconf.GetNextEntry(name, dummy);
+    }
+}
+
+#endif // TEST_FILECONF
+

 // ----------------------------------------------------------------------------
 // MIME types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MIME types
 // ----------------------------------------------------------------------------


@@ -2048,8 +2112,8 @@ int main(int argc, char **argv)
         TestStringSub();
         TestStringFormat();
         TestStringFind();
         TestStringSub();
         TestStringFormat();
         TestStringFind();

-    }

         TestStringTokenizer();
         TestStringTokenizer();

+    }

 #endif // TEST_STRINGS
 
 #ifdef TEST_ARRAYS
 #endif // TEST_STRINGS
 
 #ifdef TEST_ARRAYS


@@ -2092,6 +2156,10 @@ int main(int argc, char **argv)
     TestExecute();
 #endif // TEST_EXECUTE
 
     TestExecute();
 #endif // TEST_EXECUTE
 

+#ifdef TEST_FILECONF
+    TestFileConfRead();
+#endif // TEST_FILECONF
+

 #ifdef TEST_LOG
     wxString s;
     for ( size_t n = 0; n < 8000; n++ )
 #ifdef TEST_LOG
     wxString s;
     for ( size_t n = 0; n < 8000; n++ )

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 8fc5a7ca9f914790a01cd93a80f53132c5e74078..76e0fdf31f678afa2c8dc1a3f02a42c08ffd4b1e 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -265,7 +265,7 @@ bool MyApp::OnInit()
     frame->Show(TRUE);
     frame->SetCursor(wxCursor(wxCURSOR_HAND));
 
     frame->Show(TRUE);
     frame->SetCursor(wxCursor(wxCURSOR_HAND));
 

-    frame->GetPanel()->m_notebook->SetSelection(6);
+    //frame->GetPanel()->m_notebook->SetSelection(6);

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 


@@ -395,7 +395,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
     m_text->SetBackgroundColour("wheat");
 
                             wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
     m_text->SetBackgroundColour("wheat");
 

-    wxLog::AddTraceMask(_T("focus"));
+    // wxLog::AddTraceMask(_T("focus"));

     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
     m_notebook = new wxNotebook(this, ID_NOTEBOOK);
     m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));
 
     m_notebook = new wxNotebook(this, ID_NOTEBOOK);


@@ -832,6 +832,7 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
                 m_lbSelectThis->Enable( event.GetInt() == 0 );
                 m_lbSelectNum->Enable( event.GetInt() == 0 );
                 m_listboxSorted->Enable( event.GetInt() == 0 );
                 m_lbSelectThis->Enable( event.GetInt() == 0 );
                 m_lbSelectNum->Enable( event.GetInt() == 0 );
                 m_listboxSorted->Enable( event.GetInt() == 0 );

+                FindWindow(ID_CHANGE_COLOUR)->Enable( event.GetInt() == 0 );

                 break;
             }
         case ID_LISTBOX_SEL_NUM:
                 break;
             }
         case ID_LISTBOX_SEL_NUM:

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 5747dc5e79475b7be57fee33259107b700455bc4..808a4b4f7fbe45b1b260740867aa7c45112b1335 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -144,16 +144,14 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it

-      RECT rect ;
-      rect.left   = 0 ;
-      rect.top    = 0 ;
-      rect.right  = nCheckWidth ;
-      rect.bottom = nCheckHeight ;
-
-#ifdef __WIN32__
-#ifndef __SC__
+#if defined(__WIN32__) && !defined(__SC__)
+      RECT rect;
+      rect.left   = 0;
+      rect.top    = 0;
+      rect.right  = nCheckWidth;
+      rect.bottom = nCheckHeight;
+

       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);

-#endif

 #else
       // In WIN16, draw a cross
       HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
 #else
       // In WIN16, draw a cross
       HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));