Mercurial > dwindows

changeset 2938:1184f58135ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
C++: Eliminate remnants of C code I missed while porting to C++. Only exception is the Android specific dw_file_open() call... it is a replacement for a C API and a macro on most platforms... Plus I really don't like that call, but Android required it... so leaving it as is for now.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 31 Dec 2022 21:42:12 +0000
parents cacb6610abfc
children ebbc5b16899e
files dw.hpp dwtestoo.cpp
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dw.hpp	Sat Dec 31 04:29:47 2022 +0000
+++ b/dw.hpp	Sat Dec 31 21:42:12 2022 +0000
@@ -2129,6 +2129,8 @@
     void FreeIcon(HICN icon) { dw_icon_free(icon); }
     void TaskBarInsert(Widget *handle, HICN icon,  const char *bubbletext) { dw_taskbar_insert(handle ? handle->GetHWND() : DW_NOHWND, icon, bubbletext); }
     void TaskBarDelete(Widget *handle, HICN icon) { dw_taskbar_delete(handle ? handle->GetHWND() : DW_NOHWND, icon); }
+    char * WideToUTF8(const wchar_t * wstring) { return dw_wchar_to_utf8(wstring); }
+    wchar_t *UTF8ToWide(const char * utf8string) { return dw_utf8_to_wchar(utf8string); }
 };
 
 // Static singleton reference declared outside of the class
--- a/dwtestoo.cpp	Sat Dec 31 04:29:47 2022 +0000
+++ b/dwtestoo.cpp	Sat Dec 31 21:42:12 2022 +0000
@@ -349,7 +349,7 @@
     }
 
     // Request that the render widgets redraw...
-    // If not using direct rendering, call update_render() to
+    // If not using direct rendering, call UpdateRender() to
     // redraw the in memory pixmaps. Then trigger the expose events.
     // Expose will call update_render() to draw directly or bitblt the pixmaps.
     void RenderDraw() {
@@ -515,7 +515,7 @@
                 // Increment the ready count while protected by mutex
                 mutex->Lock();
                 ready++;
-                sprintf(buf, "Thread %d work done. ready=%d", threadnum, ready);
+                snprintf(buf, BUF_SIZE, "Thread %d work done. ready=%d", threadnum, ready);
                 // If all 4 threads have incrememted the ready count...
                 // Post the control event semaphore so things will get started.
                 if(ready == 4)
@@ -822,7 +822,7 @@
     void CreateRender(DW::Box *notebookbox) {
         int vscrollbarwidth, hscrollbarheight;
         wchar_t widestring[100] = L"DWTest Wide";
-        char *utf8string = dw_wchar_to_utf8(widestring);
+        char *utf8string = app->WideToUTF8(widestring);
 
         // create a box to pack into the notebook page
         DW::Box *pagebox = new DW::Box(DW_HORZ, 2);
@@ -1586,7 +1586,7 @@
         });
 
         // add LOTS of items
-        app->Debug("before appending 500 items to combobox using dw_listbox_list_append()\n");
+        app->Debug("before appending 500 items to combobox using DW::ListBox::ListAppend()\n");
         char **text = (char **)malloc(500*sizeof(char *));
         for(int i = 0; i < 500; i++)
         {
@@ -2049,7 +2049,7 @@
     for(int intfeat=DW_FEATURE_HTML; intfeat<DW_FEATURE_MAX; intfeat++)
     {
         DWFEATURE feat = static_cast<DWFEATURE>(intfeat);
-        int result = dw_feature_get(feat);
+        int result = app->GetFeature(feat);
         const char *status = "Unsupported";
 
         if(result == 0)