Mercurial > dwindows
annotate dw.hpp @ 2985:e5d2c74b1a51
Android: Fixed a big in dw_window_get_text() introduced at some point.
Also added a number of safety checks to prevent calling into kotlin with
NULL.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 27 Mar 2023 08:46:23 +0000 |
parents | fffb4904c90b |
children |
rev | line source |
---|---|
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1 // Dynamic Windows C++ Language Bindings |
2947
edb4307ac7ce
Update copyright date, readme, license and changelog for upcoming release.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2941
diff
changeset
|
2 // Copyright (C) 2022-2023 Brian Smith |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
3 // Recommends a C++11 compatible compiler. |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
4 |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
5 #ifndef _HPP_DW |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
6 #define _HPP_DW |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
7 #include <dw.h> |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
8 #include <cstring> |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
9 #include <string> |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
10 #include <vector> |
2973
ac880987a2c4
Mac: Fix compiling with Xcode 8.2.1, needed #include <stdlib.h> and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2972
diff
changeset
|
11 // For alloca() and calloc() |
ac880987a2c4
Mac: Fix compiling with Xcode 8.2.1, needed #include <stdlib.h> and
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2972
diff
changeset
|
12 #include <stdlib.h> |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
13 |
2872
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
14 // Attempt to support compilers without nullptr type literal |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
15 #if __cplusplus >= 201103L |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
16 #define DW_CPP11 |
2872
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
17 #define DW_NULL nullptr |
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
18 #else |
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
19 #define DW_NULL NULL |
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
20 #endif |
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
21 |
2972
5727036821bd
C++: Don't bother with lambdas unless using GCC5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2964
diff
changeset
|
22 // Support Lambdas on C++11, Visual C 2015 or GCC 5 |
2928
102b96d77f89
C++: Visual Studio 2013 lambda support also did not work, bump to 2015.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2927
diff
changeset
|
23 #if defined(DW_CPP11) || (defined(_MSC_VER) && _MSC_VER >= 1900) || \ |
2972
5727036821bd
C++: Don't bother with lambdas unless using GCC5.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2964
diff
changeset
|
24 (defined(__GNUC__) && __GNUC__ > 4) |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
25 #define DW_LAMBDA |
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
26 #include <functional> |
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
27 #endif |
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
28 |
2873
0bbfb19022e7
C++: GCC prior to 4.7 does not support the override keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2872
diff
changeset
|
29 // Attempt to allow compilation on GCC older than 4.7 |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
30 #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)) |
2873
0bbfb19022e7
C++: GCC prior to 4.7 does not support the override keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2872
diff
changeset
|
31 #define override |
2926
5b584c5ddc96
C++: GCC before 4.7 also doesn't support final.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2925
diff
changeset
|
32 #define final |
2873
0bbfb19022e7
C++: GCC prior to 4.7 does not support the override keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2872
diff
changeset
|
33 #endif |
0bbfb19022e7
C++: GCC prior to 4.7 does not support the override keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2872
diff
changeset
|
34 |
2925
32bd25b05918
C++: Fix MSVC older than 2012 which does not support final keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2924
diff
changeset
|
35 // Attempt to allow compilation on MSVC older than 2012 |
32bd25b05918
C++: Fix MSVC older than 2012 which does not support final keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2924
diff
changeset
|
36 #if defined(_MSC_VER) && _MSC_VER < 1700 |
32bd25b05918
C++: Fix MSVC older than 2012 which does not support final keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2924
diff
changeset
|
37 #define final |
32bd25b05918
C++: Fix MSVC older than 2012 which does not support final keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2924
diff
changeset
|
38 #endif |
32bd25b05918
C++: Fix MSVC older than 2012 which does not support final keyword.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2924
diff
changeset
|
39 |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
40 namespace DW |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
41 { |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
42 |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
43 #define _DW_THREAD_STACK 10000 |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
44 |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
45 // Macro to convert an allocated C string buffer to std::string, free the buffer and return the std::string |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
46 #define _dw_string_free_return(a) std::string utf8string = a ? std::string(a) : std::string(); if(a) dw_free(a); return utf8string; |
2933
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
47 |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
48 // Forward declare these so they can be referenced |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
49 class Render; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
50 class Pixmap; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
51 class MenuItem; |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
52 class Window; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
53 |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
54 // Base handle class which allows opaque access to |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
55 // The base system handles |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
56 class Handle |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
57 { |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
58 protected: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
59 void *handle; |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
60 void SetHandle(void *newhandle) { handle = newhandle; } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
61 public: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
62 void *GetHandle() { return handle; } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
63 }; |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
64 |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
65 // Widget class allows packing and style |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
66 class Widget : public Handle |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
67 { |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
68 protected: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
69 void SetHWND(HWND newhwnd) { |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
70 hwnd = newhwnd; |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
71 SetHandle(reinterpret_cast<void *>(newhwnd)); |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
72 // Save the C++ class pointer in the window data for later |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
73 dw_window_set_data(hwnd, "_dw_classptr", this); |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
74 } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
75 HWND hwnd; |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
76 public: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
77 HWND GetHWND() { return hwnd; } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
78 int Destroy() { int retval = dw_window_destroy(hwnd); delete this; return retval; } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
79 Widget *FromID(int id) { |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
80 HWND child = dw_window_from_id(hwnd, id); |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
81 if(child) { |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
82 return reinterpret_cast<Widget *>(dw_window_get_data(child, "_dw_classptr")); |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
83 } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
84 return DW_NULL; |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
85 } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
86 void GetPreferredSize(int *width, int *height) { dw_window_get_preferred_size(hwnd, width, height); } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
87 int SetColor(unsigned long fore, unsigned long back) { return dw_window_set_color(hwnd, fore, back); } |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
88 void SetData(const char *dataname, void *data) { dw_window_set_data(hwnd, dataname, data); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
89 void SetData(std::string dataname, void *data) { dw_window_set_data(hwnd, dataname.c_str(), data); } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
90 void *GetData(const char *dataname) { return dw_window_get_data(hwnd, dataname); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
91 void *GetData(std::string dataname) { return dw_window_get_data(hwnd, dataname.c_str()); } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
92 void SetPointer(int cursortype) { dw_window_set_pointer(hwnd, cursortype); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
93 void SetStyle(unsigned long flags, unsigned long mask) { dw_window_set_style(hwnd, flags, mask); } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
94 void SetStyle(unsigned long flags) { dw_window_set_style(hwnd, flags, flags); } |
2931
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
95 void SetTooltip(const char *bubbletext) { dw_window_set_tooltip(hwnd, bubbletext); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
96 void SetTooltip(std::string bubbletext) { dw_window_set_tooltip(hwnd, bubbletext.c_str()); } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
97 int Unpack() { return dw_box_unpack(hwnd); } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
98 }; |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
99 |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
100 // Box class is a packable object |
2877
6f31b7991fa0
C++: Fix Combobox class by making the parent classes virtual.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2876
diff
changeset
|
101 class Boxes : virtual public Widget |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
102 { |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
103 public: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
104 // User functions |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
105 void PackStart(Widget *item, int width, int height, int hsize, int vsize, int pad) { |
2871
4b7c4cd7a11d
OS2: Fix building the C++ bindings on OS/2 with GCC.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2870
diff
changeset
|
106 dw_box_pack_start(hwnd, item ? item->GetHWND() : DW_NOHWND, width, height, hsize, vsize, pad); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
107 void PackStart(Widget *item, int hsize, int vsize, int pad) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
108 dw_box_pack_start(hwnd, item ? item->GetHWND() : DW_NOHWND, DW_SIZE_AUTO, DW_SIZE_AUTO, hsize, vsize, pad); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
109 void PackEnd(Widget *item, int width, int height, int hsize, int vsize, int pad) { |
2871
4b7c4cd7a11d
OS2: Fix building the C++ bindings on OS/2 with GCC.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2870
diff
changeset
|
110 dw_box_pack_end(hwnd, item ? item->GetHWND() : DW_NOHWND, width, height, hsize, vsize, pad); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
111 void PackEnd(Widget *item, int hsize, int vsize, int pad) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
112 dw_box_pack_end(hwnd, item ? item->GetHWND() : DW_NOHWND, DW_SIZE_AUTO, DW_SIZE_AUTO, hsize, vsize, pad); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
113 void PackAtIndex(Widget *item, int index, int width, int height, int hsize, int vsize, int pad) { |
2871
4b7c4cd7a11d
OS2: Fix building the C++ bindings on OS/2 with GCC.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2870
diff
changeset
|
114 dw_box_pack_at_index(hwnd, item ? item->GetHWND() : DW_NOHWND, index, width, height, hsize, vsize, pad); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
115 void PackAtIndex(Widget *item, int index, int hsize, int vsize, int pad) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
116 dw_box_pack_at_index(hwnd, item ? item->GetHWND() : DW_NOHWND, index, DW_SIZE_AUTO, DW_SIZE_AUTO, hsize, vsize, pad); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
117 Widget *UnpackAtIndex(int index) { HWND widget = dw_box_unpack_at_index(hwnd, index); |
2872
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
118 void *classptr = widget ? dw_window_get_data(widget, "_dw_classptr") : DW_NULL; |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
119 return reinterpret_cast<Widget *>(classptr); |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
120 } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
121 }; |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
122 |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
123 class Box : public Boxes |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
124 { |
2877
6f31b7991fa0
C++: Fix Combobox class by making the parent classes virtual.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2876
diff
changeset
|
125 public: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
126 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
127 Box(int type, int pad) { SetHWND(dw_box_new(type, pad)); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
128 Box(int type) { SetHWND(dw_box_new(type, 0)); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
129 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
130 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
131 // Special scrollable box |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
132 class ScrollBox : public Boxes |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
133 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
134 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
135 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
136 ScrollBox(int type, int pad) { SetHWND(dw_scrollbox_new(type, pad)); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
137 ScrollBox(int type) { SetHWND(dw_scrollbox_new(type, 0)); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
138 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
139 // User functions |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
140 int GetRange(int orient) { return dw_scrollbox_get_range(hwnd, orient); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
141 int GetPos(int orient) { return dw_scrollbox_get_pos(hwnd, orient); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
142 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
143 |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
144 // TODO: Find a way to implement this cross platform... |
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
145 // That way we can skip adding unused signal handlers |
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
146 #define IsOverridden(a, b) true |
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
147 |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
148 // Base class for several types of widgets including buttons and menu items |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
149 class Clickable : virtual public Widget |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
150 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
151 private: |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
152 bool ClickedConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
153 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
154 std::function<int()> _ConnectClicked; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
155 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
156 int (*_ConnectClickedOld)(Clickable *); |
2911
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
157 static int _OnClicked(HWND window, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
158 Clickable *classptr = reinterpret_cast<Clickable *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
159 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
160 if(classptr->_ConnectClicked) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
161 return classptr->_ConnectClicked(); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
162 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
163 if(classptr->_ConnectClickedOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
164 return classptr->_ConnectClickedOld(classptr); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
165 return classptr->OnClicked(); } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
166 protected: |
2929
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
167 virtual ~Clickable() {} |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
168 void Setup() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
169 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
170 _ConnectClicked = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
171 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
172 _ConnectClickedOld = 0; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
173 if(IsOverridden(Clickable::OnClicked, this)) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
174 dw_signal_connect(hwnd, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_OnClicked), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
175 ClickedConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
176 } |
2911
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
177 else { |
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
178 ClickedConnected = false; |
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
179 } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
180 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
181 // Our signal handler functions to be overriden... |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
182 // If they are not overridden and an event is generated, remove the unused handler |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
183 virtual int OnClicked() { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
184 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_CLICKED); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
185 ClickedConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
186 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
187 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
188 public: |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
189 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
190 void ConnectClicked(std::function<int()> userfunc) |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
191 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
192 _ConnectClicked = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
193 if(!ClickedConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
194 dw_signal_connect(hwnd, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_OnClicked), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
195 ClickedConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
196 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
197 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
198 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
199 void ConnectClicked(int (*userfunc)(Clickable *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
200 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
201 _ConnectClickedOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
202 if(!ClickedConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
203 dw_signal_connect(hwnd, DW_SIGNAL_CLICKED, DW_SIGNAL_FUNC(_OnClicked), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
204 ClickedConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
205 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
206 } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
207 }; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
208 |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
209 class Menus : public Handle |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
210 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
211 protected: |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
212 void SetHMENUI(HMENUI newmenu) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
213 menu = newmenu; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
214 SetHandle(reinterpret_cast<void *>(newmenu)); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
215 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
216 HMENUI menu; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
217 public: |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
218 // User functions |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
219 HMENUI GetHMENUI() { return menu; } |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
220 MenuItem *AppendItem(const char *title, unsigned long id, unsigned long flags, int end, int check, Menus *submenu); |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
221 MenuItem *AppendItem(const char *title, unsigned long flags, int check, Menus *submenu); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
222 MenuItem *AppendItem(const char *title, unsigned long flags, int check); |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
223 MenuItem *AppendItem(const char *title, Menus *submenu); |
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
224 MenuItem *AppendItem(const char *title); |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
225 MenuItem *AppendItem(std::string title, unsigned long id, unsigned long flags, int end, int check, Menus *submenu); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
226 MenuItem *AppendItem(std::string title, unsigned long flags, int check, Menus *submenu); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
227 MenuItem *AppendItem(std::string title, unsigned long flags, int check); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
228 MenuItem *AppendItem(std::string title, Menus *submenu); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
229 MenuItem *AppendItem(std::string title); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
230 }; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
231 |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
232 class Menu : public Menus |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
233 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
234 public: |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
235 // Constructors |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
236 Menu(unsigned long id) { SetHMENUI(dw_menu_new(id)); } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
237 Menu() { SetHMENUI(dw_menu_new(0)); } |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
238 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
239 // User functions |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
240 void Popup(Window *window, int x, int y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
241 void Popup(Window *window); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
242 }; |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
243 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
244 class MenuBar : public Menus |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
245 { |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
246 public: |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
247 // Constructors |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
248 MenuBar(HWND location) { SetHMENUI(dw_menubar_new(location)); } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
249 }; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
250 |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
251 class MenuItem : public Clickable |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
252 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
253 public: |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
254 // Constructors |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
255 MenuItem(Menus *menu, const char *title, unsigned long id, unsigned long flags, int end, int check, Menus *submenu) { |
2911
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
256 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title, id, flags, end, check, submenu ? submenu->GetHMENUI() : DW_NOMENU)); Setup(); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
257 } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
258 MenuItem(Menus *menu, const char *title, unsigned long flags, int check, Menus *submenu) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
259 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title, DW_MENU_AUTO, flags, TRUE, check, submenu ? submenu->GetHMENUI() : DW_NOMENU)); Setup(); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
260 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
261 MenuItem(Menus *menu, const char *title, unsigned long flags, int check) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
262 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title, DW_MENU_AUTO, flags, TRUE, check, DW_NOMENU)); Setup(); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
263 } |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
264 MenuItem(Menus *menu, const char *title, Menus *submenu) { |
2911
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
265 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title, DW_MENU_AUTO, 0, TRUE, FALSE, submenu ? submenu->GetHMENUI() : DW_NOMENU)); Setup(); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
266 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
267 MenuItem(Menus *menu, const char *title) { |
2911
f27fe14eef82
C++: MenuItem constructors need to call Setup() and Clickable::ClickedConnected may
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2908
diff
changeset
|
268 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title, DW_MENU_AUTO, 0, TRUE, FALSE, DW_NOMENU)); Setup(); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
269 } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
270 MenuItem(Menus *menu, std::string title, unsigned long id, unsigned long flags, int end, int check, Menus *submenu) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
271 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title.c_str(), id, flags, end, check, submenu ? submenu->GetHMENUI() : DW_NOMENU)); Setup(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
272 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
273 MenuItem(Menus *menu, std::string title, unsigned long flags, int check, Menus *submenu) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
274 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title.c_str(), DW_MENU_AUTO, flags, TRUE, check, submenu ? submenu->GetHMENUI() : DW_NOMENU)); Setup(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
275 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
276 MenuItem(Menus *menu, std::string title, unsigned long flags, int check) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
277 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title.c_str(), DW_MENU_AUTO, flags, TRUE, check, DW_NOMENU)); Setup(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
278 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
279 MenuItem(Menus *menu, std::string title, Menus *submenu) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
280 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title.c_str(), DW_MENU_AUTO, 0, TRUE, FALSE, submenu ? submenu->GetHMENUI() : DW_NOMENU)); Setup(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
281 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
282 MenuItem(Menus *menu, std::string title) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
283 SetHWND(dw_menu_append_item(menu->GetHMENUI(), title.c_str(), DW_MENU_AUTO, 0, TRUE, FALSE, DW_NOMENU)); Setup(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
284 } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
285 |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
286 // User functions |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
287 void SetState(unsigned long flags) { dw_window_set_style(hwnd, flags, flags); } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
288 }; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
289 |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
290 MenuItem *Menus::AppendItem(const char *title, unsigned long id, unsigned long flags, int end, int check, Menus *submenu) { |
2891
185c1e9674a1
C++: Fix a crash caused by passing the wrong variable to the constructor.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2890
diff
changeset
|
291 return new MenuItem(this, title, id, flags, end, check, submenu); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
292 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
293 |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
294 MenuItem *Menus::AppendItem(const char *title, unsigned long flags, int check, Menus *submenu) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
295 return new MenuItem(this, title, flags, check, submenu); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
296 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
297 |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
298 MenuItem *Menus::AppendItem(const char *title, unsigned long flags, int check) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
299 return new MenuItem(this, title, flags, check); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
300 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
301 |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
302 MenuItem *Menus::AppendItem(const char *title, Menus *submenu) { |
2891
185c1e9674a1
C++: Fix a crash caused by passing the wrong variable to the constructor.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2890
diff
changeset
|
303 return new MenuItem(this, title, submenu); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
304 } |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
305 MenuItem *Menus::AppendItem(const char *title) { |
2891
185c1e9674a1
C++: Fix a crash caused by passing the wrong variable to the constructor.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2890
diff
changeset
|
306 return new MenuItem(this, title); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
307 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
308 |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
309 MenuItem *Menus::AppendItem(std::string title, unsigned long id, unsigned long flags, int end, int check, Menus *submenu) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
310 return new MenuItem(this, title.c_str(), id, flags, end, check, submenu); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
311 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
312 |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
313 MenuItem *Menus::AppendItem(std::string title, unsigned long flags, int check, Menus *submenu) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
314 return new MenuItem(this, title.c_str(), flags, check, submenu); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
315 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
316 |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
317 MenuItem *Menus::AppendItem(std::string title, unsigned long flags, int check) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
318 return new MenuItem(this, title.c_str(), flags, check); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
319 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
320 |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
321 MenuItem *Menus::AppendItem(std::string title, Menus *submenu) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
322 return new MenuItem(this, title.c_str(), submenu); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
323 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
324 MenuItem *Menus::AppendItem(std::string title) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
325 return new MenuItem(this, title.c_str()); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
326 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
327 |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
328 |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
329 // Top-level window class is packable |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
330 class Window : public Boxes |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
331 { |
2865
fd32dce7fecd
Initial signal handler support for the C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2861
diff
changeset
|
332 private: |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
333 bool DeleteConnected, ConfigureConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
334 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
335 std::function<int()> _ConnectDelete; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
336 std::function<int(int, int)> _ConnectConfigure; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
337 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
338 int (*_ConnectDeleteOld)(Window *); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
339 int (*_ConnectConfigureOld)(Window *, int width, int height); |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
340 void Setup() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
341 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
342 _ConnectDelete = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
343 _ConnectConfigure = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
344 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
345 _ConnectDeleteOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
346 _ConnectConfigureOld = 0; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
347 menu = DW_NULL; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
348 if(IsOverridden(Window::OnDelete, this)) { |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
349 dw_signal_connect(hwnd, DW_SIGNAL_DELETE, DW_SIGNAL_FUNC(_OnDelete), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
350 DeleteConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
351 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
352 DeleteConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
353 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
354 if(IsOverridden(Window::OnConfigure, this)) { |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
355 dw_signal_connect(hwnd, DW_SIGNAL_CONFIGURE, DW_SIGNAL_FUNC(_OnConfigure), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
356 ConfigureConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
357 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
358 ConfigureConnected = false; |
2906
9d6280f206bd
Minor code cleanups in the template and C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2905
diff
changeset
|
359 } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
360 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
361 static int _OnDelete(HWND window, void *data) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
362 Window *classptr = reinterpret_cast<Window *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
363 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
364 if(classptr->_ConnectDelete) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
365 return classptr->_ConnectDelete(); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
366 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
367 if(classptr->_ConnectDeleteOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
368 return classptr->_ConnectDeleteOld(classptr); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
369 return classptr->OnDelete(); } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
370 static int _OnConfigure(HWND window, int width, int height, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
371 Window *classptr = reinterpret_cast<Window *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
372 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
373 if(classptr->_ConnectConfigure) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
374 return classptr->_ConnectConfigure(width, height); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
375 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
376 if(classptr->_ConnectConfigureOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
377 return classptr->_ConnectConfigureOld(classptr, width, height); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
378 return classptr->OnConfigure(width, height); } |
2884
06e475feaac0
C++: Split Menu and MenuBar to prevent type conflicts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2882
diff
changeset
|
379 MenuBar *menu; |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
380 public: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
381 // Constructors |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
382 Window(HWND owner, const char *title, unsigned long style) { SetHWND(dw_window_new(owner, title, style)); Setup(); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
383 Window(const char *title, unsigned long style) { SetHWND(dw_window_new(HWND_DESKTOP, title, style)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
384 Window(HWND owner, std::string title, unsigned long style) { SetHWND(dw_window_new(owner, title.c_str(), style)); Setup(); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
385 Window(std::string title, unsigned long style) { SetHWND(dw_window_new(HWND_DESKTOP, title.c_str(), style)); Setup(); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
386 Window(unsigned long style) { SetHWND(dw_window_new(HWND_DESKTOP, "", style)); Setup(); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
387 Window(const char *title) { SetHWND(dw_window_new(HWND_DESKTOP, title, DW_FCF_SYSMENU | DW_FCF_TITLEBAR | |
2865
fd32dce7fecd
Initial signal handler support for the C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2861
diff
changeset
|
388 DW_FCF_TASKLIST | DW_FCF_SIZEBORDER | DW_FCF_MINMAX)); Setup(); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
389 Window(std::string title) { SetHWND(dw_window_new(HWND_DESKTOP, title.c_str(), DW_FCF_SYSMENU | DW_FCF_TITLEBAR | |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
390 DW_FCF_TASKLIST | DW_FCF_SIZEBORDER | DW_FCF_MINMAX)); Setup(); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
391 Window() { SetHWND(dw_window_new(HWND_DESKTOP, "", DW_FCF_SYSMENU | DW_FCF_TITLEBAR | |
2865
fd32dce7fecd
Initial signal handler support for the C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2861
diff
changeset
|
392 DW_FCF_TASKLIST | DW_FCF_SIZEBORDER | DW_FCF_MINMAX)); Setup(); } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
393 |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
394 // User functions |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
395 void SetText(const char *text) { dw_window_set_text(hwnd, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
396 void SetText(std::string text) { dw_window_set_text(hwnd, text.c_str()); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
397 char *GetCText() { return dw_window_get_text(hwnd); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
398 std::string GetText() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
399 char *retval = dw_window_get_text(hwnd); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
400 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
401 } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
402 void SetSize(unsigned long width, unsigned long height) { dw_window_set_size(hwnd, width, height); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
403 int Show() { return dw_window_show(hwnd); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
404 int Hide() { return dw_window_hide(hwnd); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
405 void SetGravity(int horz, int vert) { dw_window_set_gravity(hwnd, horz, vert); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
406 int Minimize() { return dw_window_minimize(hwnd); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
407 int Raise() { return dw_window_raise(hwnd); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
408 int Lower() { return dw_window_lower(hwnd); } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
409 void Redraw() { dw_window_redraw(hwnd); } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
410 void Default(Widget *defaultitem) { if(defaultitem) dw_window_default(hwnd, defaultitem->GetHWND()); } |
2939
ebbc5b16899e
C++: Another couple fixes, context menus and PackAtIndex that got lost during porting.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2938
diff
changeset
|
411 void ClickDefault(Widget *defaultitem) { if(defaultitem) dw_window_click_default(hwnd, defaultitem->GetHWND()); } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
412 void SetIcon(HICN icon) { dw_window_set_icon(hwnd, icon); } |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
413 MenuBar *MenuBarNew() { if(!menu) menu = new MenuBar(hwnd); return menu; } |
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
414 void Popup(Menu *menu, int x, int y) { |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
415 if(menu) { |
2890
ab4c86ddc63a
C++: Fix a logic error reported by MSVC 2022.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2889
diff
changeset
|
416 HMENUI pmenu = menu->GetHMENUI(); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
417 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
418 dw_menu_popup(&pmenu, hwnd, x, y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
419 delete menu; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
420 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
421 } |
2889
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
422 void Popup(Menu *menu) { |
4b075e64536c
C++: Add some simple menu code to see if things are working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2885
diff
changeset
|
423 if(menu) { |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
424 long x, y; |
2890
ab4c86ddc63a
C++: Fix a logic error reported by MSVC 2022.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2889
diff
changeset
|
425 HMENUI pmenu = menu->GetHMENUI(); |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
426 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
427 dw_pointer_query_pos(&x, &y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
428 dw_menu_popup(&pmenu, hwnd, (int)x, (int)y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
429 delete menu; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
430 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
431 } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
432 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
433 void ConnectDelete(std::function<int()> userfunc) |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
434 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
435 _ConnectDelete = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
436 if(!DeleteConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
437 dw_signal_connect(hwnd, DW_SIGNAL_DELETE, DW_SIGNAL_FUNC(_OnDelete), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
438 DeleteConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
439 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
440 DeleteConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
441 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
442 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
443 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
444 void ConnectDelete(int (*userfunc)(Window *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
445 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
446 _ConnectDeleteOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
447 if(!DeleteConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
448 dw_signal_connect(hwnd, DW_SIGNAL_DELETE, DW_SIGNAL_FUNC(_OnDelete), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
449 DeleteConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
450 } else { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
451 DeleteConnected = false; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
452 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
453 } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
454 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
455 void ConnectConfigure(std::function<int(int, int)> userfunc) |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
456 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
457 _ConnectConfigure = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
458 if(!ConfigureConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
459 dw_signal_connect(hwnd, DW_SIGNAL_CONFIGURE, DW_SIGNAL_FUNC(_OnConfigure), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
460 ConfigureConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
461 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
462 ConfigureConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
463 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
464 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
465 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
466 void ConnectConfigure(int (*userfunc)(Window *, int, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
467 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
468 _ConnectConfigureOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
469 if(!ConfigureConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
470 dw_signal_connect(hwnd, DW_SIGNAL_CONFIGURE, DW_SIGNAL_FUNC(_OnConfigure), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
471 ConfigureConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
472 } else { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
473 ConfigureConnected = false; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
474 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
475 } |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
476 protected: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
477 // Our signal handler functions to be overriden... |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
478 // If they are not overridden and an event is generated, remove the unused handler |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
479 virtual int OnDelete() { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
480 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_DELETE); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
481 DeleteConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
482 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
483 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
484 virtual int OnConfigure(int width, int height) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
485 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_CONFIGURE); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
486 ConfigureConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
487 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
488 }; |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
489 }; |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
490 |
2885
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
491 void Menu::Popup(Window *window, int x, int y) |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
492 { |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
493 if(window) |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
494 { |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
495 HMENUI pmenu = menu; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
496 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
497 dw_menu_popup(&pmenu, window->GetHWND(), x, y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
498 delete this; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
499 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
500 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
501 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
502 void Menu::Popup(Window *window) |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
503 { |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
504 if(window) { |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
505 long x, y; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
506 HMENUI pmenu = menu; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
507 |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
508 dw_pointer_query_pos(&x, &y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
509 dw_menu_popup(&pmenu, window->GetHWND(), (int)x, (int)y); |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
510 delete this; |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
511 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
512 } |
df1b7f7d1703
C++: Finish up the menu classes, not sure if this is ideal yet.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2884
diff
changeset
|
513 |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
514 // Class for focusable widgets |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
515 class Focusable : virtual public Widget |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
516 { |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
517 public: |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
518 void Enable() { dw_window_enable(hwnd); } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
519 void Disable() { dw_window_disable(hwnd); } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
520 void SetFocus() { dw_window_set_focus(hwnd); } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
521 }; |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
522 |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
523 // Text based button |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
524 class TextButton : public Clickable, public Focusable |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
525 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
526 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
527 // User functions |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
528 void SetText(const char *text) { dw_window_set_text(hwnd, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
529 void SetText(std::string text) { dw_window_set_text(hwnd, text.c_str()); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
530 char *GetCText() { return dw_window_get_text(hwnd); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
531 std::string GetText() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
532 char *retval = dw_window_get_text(hwnd); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
533 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
534 } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
535 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
536 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
537 class Button : public TextButton |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
538 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
539 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
540 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
541 Button(const char *text, unsigned long id) { SetHWND(dw_button_new(text, id)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
542 Button(std::string text, unsigned long id) { SetHWND(dw_button_new(text.c_str(), id)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
543 Button(unsigned long id) { SetHWND(dw_button_new("", id)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
544 Button(const char *text) { SetHWND(dw_button_new(text, 0)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
545 Button(std::string text) { SetHWND(dw_button_new(text.c_str(), 0)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
546 Button() { SetHWND(dw_button_new("", 0)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
547 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
548 |
2931
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
549 class BitmapWidget : virtual public Widget |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
550 { |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
551 public: |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
552 // User functions |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
553 void Set(unsigned long id) { dw_window_set_bitmap(hwnd, id, DW_NULL); } |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
554 void Set(const char *file) { dw_window_set_bitmap(hwnd, 0, file); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
555 void Set(std::string file) { dw_window_set_bitmap(hwnd, 0, file.c_str()); } |
2931
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
556 void Set(const char *data, int len) { dw_window_set_bitmap_from_data(hwnd, 0, data, len); } |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
557 }; |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
558 |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
559 // Image based button |
2931
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
560 class BitmapButton : public Clickable, public Focusable, public BitmapWidget |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
561 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
562 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
563 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
564 BitmapButton(const char *text, unsigned long id) { SetHWND(dw_bitmapbutton_new(text, id)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
565 BitmapButton(unsigned long id) { SetHWND(dw_bitmapbutton_new("", id)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
566 BitmapButton(const char *text, unsigned long id, const char *file) { SetHWND(dw_bitmapbutton_new_from_file(text, id, file)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
567 BitmapButton(const char *text, const char *file) { SetHWND(dw_bitmapbutton_new_from_file(text, 0, file)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
568 BitmapButton(const char *text, unsigned long id, const char *data, int len) { SetHWND(dw_bitmapbutton_new_from_data(text, id, data, len)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
569 BitmapButton(const char *text, const char *data, int len) { SetHWND(dw_bitmapbutton_new_from_data(text, 0, data, len)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
570 BitmapButton(std::string text, unsigned long id) { SetHWND(dw_bitmapbutton_new(text.c_str(), id)); Setup(); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
571 BitmapButton(std::string text, unsigned long id, std::string file) { SetHWND(dw_bitmapbutton_new_from_file(text.c_str(), id, file.c_str())); Setup(); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
572 BitmapButton(std::string text, std::string file) { SetHWND(dw_bitmapbutton_new_from_file(text.c_str(), 0, file.c_str())); Setup(); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
573 BitmapButton(std::string text, unsigned long id, const char *data, int len) { SetHWND(dw_bitmapbutton_new_from_data(text.c_str(), id, data, len)); Setup(); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
574 BitmapButton(std::string text, const char *data, int len) { SetHWND(dw_bitmapbutton_new_from_data(text.c_str(), 0, data, len)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
575 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
576 |
2877
6f31b7991fa0
C++: Fix Combobox class by making the parent classes virtual.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2876
diff
changeset
|
577 class CheckBoxes : virtual public TextButton |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
578 { |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
579 public: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
580 // User functions |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
581 void Set(int value) { dw_checkbox_set(hwnd, value); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
582 int Get() { return dw_checkbox_get(hwnd); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
583 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
584 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
585 class CheckBox : public CheckBoxes |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
586 { |
2877
6f31b7991fa0
C++: Fix Combobox class by making the parent classes virtual.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2876
diff
changeset
|
587 public: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
588 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
589 CheckBox(const char *text, unsigned long id) { SetHWND(dw_checkbox_new(text, id)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
590 CheckBox(std::string text, unsigned long id) { SetHWND(dw_checkbox_new(text.c_str(), id)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
591 CheckBox(unsigned long id) { SetHWND(dw_checkbox_new("", id)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
592 CheckBox(const char *text) { SetHWND(dw_checkbox_new(text, 0)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
593 CheckBox(std::string text) { SetHWND(dw_checkbox_new(text.c_str(), 0)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
594 CheckBox() { SetHWND(dw_checkbox_new("", 0)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
595 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
596 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
597 class RadioButton : public CheckBoxes |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
598 { |
2877
6f31b7991fa0
C++: Fix Combobox class by making the parent classes virtual.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2876
diff
changeset
|
599 public: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
600 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
601 RadioButton(const char *text, unsigned long id) { SetHWND(dw_radiobutton_new(text, id)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
602 RadioButton(std::string text, unsigned long id) { SetHWND(dw_radiobutton_new(text.c_str(), id)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
603 RadioButton(unsigned long id) { SetHWND(dw_radiobutton_new("", id)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
604 RadioButton(const char *text) { SetHWND(dw_radiobutton_new(text, 0)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
605 RadioButton(std::string text) { SetHWND(dw_radiobutton_new(text.c_str(), 0)); Setup(); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
606 RadioButton() { SetHWND(dw_radiobutton_new("", 0)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
607 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
608 |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
609 // Class for handling static text widget |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
610 class TextWidget : virtual public Widget |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
611 { |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
612 public: |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
613 // User functions |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
614 void SetText(const char *text) { dw_window_set_text(hwnd, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
615 void SetText(std::string text) { dw_window_set_text(hwnd, text.c_str()); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
616 char *GetCText() { return dw_window_get_text(hwnd); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
617 std::string GetText() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
618 char *retval = dw_window_get_text(hwnd); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
619 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
620 } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
621 int SetFont(const char *font) { return dw_window_set_font(hwnd, font); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
622 char *GetCFont() { return dw_window_get_font(hwnd); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
623 std::string GetFont() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
624 char *retval = dw_window_get_font(hwnd); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
625 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
626 } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
627 }; |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
628 |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
629 // Class for handling static text widget |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
630 class Text : public TextWidget |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
631 { |
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
632 public: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
633 // Constructors |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
634 Text(const char *text, unsigned long id) { SetHWND(dw_text_new(text, id)); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
635 Text(const char *text) { SetHWND(dw_text_new(text, 0)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
636 Text(std::string text, unsigned long id) { SetHWND(dw_text_new(text.c_str(), id)); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
637 Text(std::string text) { SetHWND(dw_text_new(text.c_str(), 0)); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
638 Text(unsigned long id) { SetHWND(dw_text_new("", id)); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
639 Text() { SetHWND(dw_text_new("", 0)); } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
640 }; |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
641 |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
642 class StatusText : public TextWidget |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
643 { |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
644 public: |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
645 // Constructors |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
646 StatusText(const char *text, unsigned long id) { SetHWND(dw_status_text_new(text, id)); } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
647 StatusText(const char *text) { SetHWND(dw_status_text_new(text, 0)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
648 StatusText(std::string text, unsigned long id) { SetHWND(dw_status_text_new(text.c_str(), id)); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
649 StatusText(std::string text) { SetHWND(dw_status_text_new(text.c_str(), 0)); } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
650 StatusText(unsigned long id) { SetHWND(dw_status_text_new("", id)); } |
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
651 StatusText() { SetHWND(dw_status_text_new("", 0)); } |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
652 }; |
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
653 |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
654 // Class for handing static image widget |
2931
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
655 class Bitmap : public BitmapWidget |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
656 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
657 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
658 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
659 Bitmap(const char *data, int len) { SetHWND(dw_bitmap_new(0)); dw_window_set_bitmap_from_data(hwnd, 0, data, len); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
660 Bitmap(const char *file) { SetHWND(dw_bitmap_new(0)); dw_window_set_bitmap(hwnd, 0, file); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
661 Bitmap(std::string file) { SetHWND(dw_bitmap_new(0)); dw_window_set_bitmap(hwnd, 0, file.c_str()); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
662 Bitmap(unsigned long id) { SetHWND(dw_bitmap_new(id)); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
663 Bitmap() { SetHWND(dw_bitmap_new(0)); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
664 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
665 |
2879
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
666 // Class for handing calendar widget |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
667 class Calendar : public Widget |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
668 { |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
669 public: |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
670 // Constructors |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
671 Calendar(unsigned long id) { SetHWND(dw_calendar_new(id)); } |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
672 Calendar() { SetHWND(dw_calendar_new(0)); } |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
673 |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
674 // User functions |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
675 void GetDate(unsigned int *year, unsigned int *month, unsigned int *day) { dw_calendar_get_date(hwnd, year, month, day); } |
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
676 void SetDate(unsigned int year, unsigned int month, unsigned int day) { dw_calendar_set_date(hwnd, year, month, day); } |
2879
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
677 }; |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
678 |
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
679 |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
680 // Abstract class that defines drawing, either to screen or picture (pixmap) |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
681 class Drawable |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
682 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
683 public: |
2929
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
684 virtual ~Drawable() { } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
685 virtual void DrawPoint(int x, int y) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
686 virtual void DrawLine(int x1, int y1, int x2, int y2) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
687 virtual void DrawPolygon(int flags, int npoints, int x[], int y[]) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
688 virtual void DrawRect(int fill, int x, int y, int width, int height) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
689 virtual void DrawArc(int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
690 virtual void DrawText(int x, int y, const char *text) = 0; |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
691 virtual void DrawText(int x, int y, std::string text) = 0; |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
692 virtual int BitBltStretch(int xdest, int ydest, int width, int height, Render *src, int xsrc, int ysrc, int srcwidth, int srcheight) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
693 virtual int BitBltStretch(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc, int srcwidth, int srcheight) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
694 virtual void BitBlt(int xdest, int ydest, int width, int height, Render *src, int xsrc, int ysrc) = 0; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
695 virtual void BitBlt(int xdest, int ydest, int width, int height, Pixmap *srcp, int xsrc, int ysrc) = 0; |
2929
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
696 void SetColor(unsigned long fore, unsigned long back) { dw_color_foreground_set(fore); dw_color_background_set(back); } |
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
697 void SetBackgroundColor(unsigned long back) { dw_color_background_set(back); } |
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
698 void SetForegroundColor(unsigned long fore) { dw_color_foreground_set(fore); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
699 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
700 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
701 class Render : public Drawable, public Widget |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
702 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
703 private: |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
704 bool ExposeConnected, ConfigureConnected, KeyPressConnected, ButtonPressConnected, ButtonReleaseConnected, MotionNotifyConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
705 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
706 std::function<int(DWExpose *)> _ConnectExpose; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
707 std::function<int(int, int)> _ConnectConfigure; |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
708 std::function<int(char c, int, int, std::string)> _ConnectKeyPress; |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
709 std::function<int(int, int, int)> _ConnectButtonPress; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
710 std::function<int(int, int, int)> _ConnectButtonRelease; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
711 std::function<int(int, int, int)> _ConnectMotionNotify; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
712 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
713 int (*_ConnectExposeOld)(Render *, DWExpose *); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
714 int (*_ConnectConfigureOld)(Render *, int width, int height); |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
715 int (*_ConnectCKeyPressOld)(Render *, char c, int vk, int state, char *utf8); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
716 int (*_ConnectKeyPressOld)(Render *, char c, int vk, int state, std::string utf8); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
717 int (*_ConnectButtonPressOld)(Render *, int x, int y, int buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
718 int (*_ConnectButtonReleaseOld)(Render *, int x, int y, int buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
719 int (*_ConnectMotionNotifyOld)(Render *, int x, int y, int buttonmask); |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
720 void Setup() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
721 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
722 _ConnectExpose = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
723 _ConnectConfigure = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
724 _ConnectKeyPress = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
725 _ConnectButtonPress = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
726 _ConnectButtonRelease = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
727 _ConnectMotionNotify = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
728 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
729 _ConnectExposeOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
730 _ConnectConfigureOld = 0; |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
731 _ConnectCKeyPressOld = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
732 _ConnectKeyPressOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
733 _ConnectButtonPressOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
734 _ConnectButtonReleaseOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
735 _ConnectMotionNotifyOld = 0; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
736 if(IsOverridden(Render::OnExpose, this)) { |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
737 dw_signal_connect(hwnd, DW_SIGNAL_EXPOSE, DW_SIGNAL_FUNC(_OnExpose), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
738 ExposeConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
739 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
740 ExposeConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
741 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
742 if(IsOverridden(Render::OnConfigure, this)) { |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
743 dw_signal_connect(hwnd, DW_SIGNAL_CONFIGURE, DW_SIGNAL_FUNC(_OnConfigure), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
744 ConfigureConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
745 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
746 ConfigureConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
747 } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
748 if(IsOverridden(Render::OnKeyPress, this)) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
749 dw_signal_connect(hwnd, DW_SIGNAL_KEY_PRESS, DW_SIGNAL_FUNC(_OnKeyPress), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
750 KeyPressConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
751 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
752 KeyPressConnected = false; |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
753 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
754 if(IsOverridden(Render::OnButtonPress, this)) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
755 dw_signal_connect(hwnd, DW_SIGNAL_BUTTON_PRESS, DW_SIGNAL_FUNC(_OnButtonPress), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
756 ButtonPressConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
757 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
758 ButtonPressConnected = false; |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
759 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
760 if(IsOverridden(Render::OnButtonRelease, this)) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
761 dw_signal_connect(hwnd, DW_SIGNAL_BUTTON_RELEASE, DW_SIGNAL_FUNC(_OnButtonRelease), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
762 ButtonReleaseConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
763 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
764 ButtonReleaseConnected = false; |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
765 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
766 if(IsOverridden(Render::OnMotionNotify, this)) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
767 dw_signal_connect(hwnd, DW_SIGNAL_MOTION_NOTIFY, DW_SIGNAL_FUNC(_OnMotionNotify), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
768 MotionNotifyConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
769 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
770 MotionNotifyConnected = false; |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
771 } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
772 } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
773 static int _OnExpose(HWND window, DWExpose *exp, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
774 Render *classptr = reinterpret_cast<Render *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
775 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
776 if(classptr->_ConnectExpose) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
777 return classptr->_ConnectExpose(exp); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
778 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
779 if(classptr->_ConnectExposeOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
780 return classptr->_ConnectExposeOld(classptr, exp); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
781 return classptr->OnExpose(exp); } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
782 static int _OnConfigure(HWND window, int width, int height, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
783 Render *classptr = reinterpret_cast<Render *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
784 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
785 if(classptr->_ConnectConfigure) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
786 return classptr->_ConnectConfigure(width, height); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
787 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
788 if(classptr->_ConnectConfigureOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
789 return classptr->_ConnectConfigureOld(classptr, width, height); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
790 return classptr->OnConfigure(width, height); } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
791 static int _OnKeyPress(HWND window, char c, int vk, int state, void *data, char *utf8) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
792 Render *classptr = reinterpret_cast<Render *>(data); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
793 std::string utf8string = utf8 ? std::string(utf8) : std::string(); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
794 #ifdef DW_LAMBDA |
2962
e6072eb914ce
C++: Step 4 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2961
diff
changeset
|
795 if(classptr->_ConnectKeyPress) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
796 return classptr->_ConnectKeyPress(c, vk, state, utf8string); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
797 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
798 if(classptr->_ConnectCKeyPressOld) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
799 return classptr->_ConnectCKeyPressOld(classptr, c, vk, state, utf8); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
800 else if(classptr->_ConnectKeyPressOld) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
801 return classptr->_ConnectKeyPressOld(classptr, c, vk, state, utf8string); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
802 return classptr->OnKeyPress(c, vk, state, utf8string); } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
803 static int _OnButtonPress(HWND window, int x, int y, int buttonmask, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
804 Render *classptr = reinterpret_cast<Render *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
805 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
806 if(classptr->_ConnectButtonPress) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
807 return classptr->_ConnectButtonPress(x, y, buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
808 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
809 if(classptr->_ConnectButtonPressOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
810 return classptr->_ConnectButtonPressOld(classptr, x, y, buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
811 return classptr->OnButtonPress(x, y, buttonmask); } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
812 static int _OnButtonRelease(HWND window, int x, int y, int buttonmask, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
813 Render *classptr = reinterpret_cast<Render *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
814 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
815 if(classptr->_ConnectButtonRelease) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
816 return classptr->_ConnectButtonRelease(x, y, buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
817 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
818 if(classptr->_ConnectButtonReleaseOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
819 return classptr->_ConnectButtonReleaseOld(classptr, x, y, buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
820 return classptr->OnButtonRelease(x, y, buttonmask); } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
821 static int _OnMotionNotify(HWND window, int x, int y, int buttonmask, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
822 Render *classptr = reinterpret_cast<Render *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
823 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
824 if(classptr->_ConnectMotionNotify) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
825 return classptr->_ConnectMotionNotify(x, y, buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
826 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
827 if(classptr->_ConnectMotionNotifyOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
828 return classptr->_ConnectMotionNotifyOld(classptr, x, y, buttonmask); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
829 return classptr->OnMotionNotify(x, y, buttonmask); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
830 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
831 // Constructors |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
832 Render(unsigned long id) { SetHWND(dw_render_new(id)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
833 Render() { SetHWND(dw_render_new(0)); Setup(); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
834 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
835 // User functions |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
836 void DrawPoint(int x, int y) { dw_draw_point(hwnd, DW_NULL, x, y); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
837 void DrawLine(int x1, int y1, int x2, int y2) { dw_draw_line(hwnd, DW_NULL, x1, y1, x2, y2); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
838 void DrawPolygon(int flags, int npoints, int x[], int y[]) { dw_draw_polygon(hwnd, DW_NULL, flags, npoints, x, y); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
839 void DrawRect(int fill, int x, int y, int width, int height) { dw_draw_rect(hwnd, DW_NULL, fill, x, y, width, height); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
840 void DrawArc(int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2) { dw_draw_arc(hwnd, DW_NULL, flags, xorigin, yorigin, x1, y1, x2, y2); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
841 void DrawText(int x, int y, const char *text) { dw_draw_text(hwnd, DW_NULL, x, y, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
842 void DrawText(int x, int y, std::string text) { dw_draw_text(hwnd, DW_NULL, x, y, text.c_str()); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
843 int BitBltStretch(int xdest, int ydest, int width, int height, Render *src, int xsrc, int ysrc, int srcwidth, int srcheight) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
844 return dw_pixmap_stretch_bitblt(hwnd, DW_NULL, xdest, ydest, width, height, src ? src->GetHWND() : DW_NOHWND, DW_NULL, xsrc, ysrc, srcwidth, srcheight); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
845 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
846 int BitBltStretch(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc, int srcwidth, int srcheight); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
847 void BitBlt(int xdest, int ydest, int width, int height, Render *src, int xsrc, int ysrc) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
848 return dw_pixmap_bitblt(hwnd, DW_NULL, xdest, ydest, width, height, src ? src->GetHWND() : DW_NOHWND, DW_NULL, xsrc, ysrc); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
849 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
850 void BitBlt(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
851 int SetFont(const char *fontname) { return dw_window_set_font(hwnd, fontname); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
852 int SetFont(std::string fontname) { return dw_window_set_font(hwnd, fontname.c_str()); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
853 void GetTextExtents(const char *text, int *width, int *height) { dw_font_text_extents_get(hwnd, DW_NULL, text, width, height); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
854 void GetTextExtents(std::string text, int *width, int *height) { dw_font_text_extents_get(hwnd, DW_NULL, text.c_str(), width, height); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
855 char *GetCFont() { return dw_window_get_font(hwnd); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
856 std::string GetFont() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
857 char *retval = dw_window_get_font(hwnd); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
858 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
859 } |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
860 void Redraw() { dw_render_redraw(hwnd); } |
2919
e609aa6a5b93
C++: Attempt to implement page 2 rendering...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2917
diff
changeset
|
861 void Flush() { dw_flush(); } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
862 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
863 void ConnectExpose(std::function<int(DWExpose *)> userfunc) |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
864 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
865 _ConnectExpose = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
866 if(!ExposeConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
867 dw_signal_connect(hwnd, DW_SIGNAL_EXPOSE, DW_SIGNAL_FUNC(_OnExpose), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
868 ExposeConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
869 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
870 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
871 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
872 void ConnectExpose(int (*userfunc)(Render *, DWExpose *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
873 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
874 _ConnectExposeOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
875 if(!ExposeConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
876 dw_signal_connect(hwnd, DW_SIGNAL_EXPOSE, DW_SIGNAL_FUNC(_OnExpose), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
877 ExposeConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
878 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
879 } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
880 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
881 void ConnectConfigure(std::function<int(int, int)> userfunc) |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
882 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
883 _ConnectConfigure = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
884 if(!ConfigureConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
885 dw_signal_connect(hwnd, DW_SIGNAL_CONFIGURE, DW_SIGNAL_FUNC(_OnConfigure), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
886 ConfigureConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
887 } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
888 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
889 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
890 void ConnectConfigure(int (*userfunc)(Render *, int, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
891 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
892 _ConnectConfigureOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
893 if(!ConfigureConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
894 dw_signal_connect(hwnd, DW_SIGNAL_CONFIGURE, DW_SIGNAL_FUNC(_OnConfigure), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
895 ConfigureConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
896 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
897 } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
898 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
899 void ConnectKeyPress(std::function<int(char, int, int, std::string)> userfunc) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
900 { |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
901 _ConnectKeyPress = userfunc; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
902 if(!KeyPressConnected) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
903 dw_signal_connect(hwnd, DW_SIGNAL_KEY_PRESS, DW_SIGNAL_FUNC(_OnKeyPress), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
904 KeyPressConnected = true; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
905 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
906 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
907 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
908 void ConnectKeyPress(int (*userfunc)(Render *, char, int, int, char *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
909 { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
910 _ConnectCKeyPressOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
911 if(!KeyPressConnected) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
912 dw_signal_connect(hwnd, DW_SIGNAL_KEY_PRESS, DW_SIGNAL_FUNC(_OnKeyPress), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
913 KeyPressConnected = true; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
914 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
915 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
916 void ConnectKeyPress(int (*userfunc)(Render *, char, int, int, std::string)) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
917 { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
918 _ConnectKeyPressOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
919 if(!KeyPressConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
920 dw_signal_connect(hwnd, DW_SIGNAL_KEY_PRESS, DW_SIGNAL_FUNC(_OnKeyPress), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
921 KeyPressConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
922 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
923 } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
924 #ifdef DW_LAMBDA |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
925 void ConnectButtonPress(std::function<int(int, int, int)> userfunc) |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
926 { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
927 _ConnectButtonPress = userfunc; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
928 if(!KeyPressConnected) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
929 dw_signal_connect(hwnd, DW_SIGNAL_BUTTON_PRESS, DW_SIGNAL_FUNC(_OnButtonPress), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
930 ButtonPressConnected = true; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
931 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
932 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
933 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
934 void ConnectButtonPress(int (*userfunc)(Render *, int, int, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
935 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
936 _ConnectButtonPressOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
937 if(!KeyPressConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
938 dw_signal_connect(hwnd, DW_SIGNAL_BUTTON_PRESS, DW_SIGNAL_FUNC(_OnButtonPress), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
939 ButtonPressConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
940 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
941 } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
942 #ifdef DW_LAMBDA |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
943 void ConnectButtonRelease(std::function<int(int, int, int)> userfunc) |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
944 { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
945 _ConnectButtonRelease = userfunc; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
946 if(!KeyPressConnected) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
947 dw_signal_connect(hwnd, DW_SIGNAL_BUTTON_RELEASE, DW_SIGNAL_FUNC(_OnButtonRelease), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
948 ButtonReleaseConnected = true; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
949 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
950 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
951 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
952 void ConnectButtonRelease(int (*userfunc)(Render *, int, int, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
953 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
954 _ConnectButtonReleaseOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
955 if(!KeyPressConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
956 dw_signal_connect(hwnd, DW_SIGNAL_BUTTON_RELEASE, DW_SIGNAL_FUNC(_OnButtonRelease), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
957 ButtonReleaseConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
958 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
959 } |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
960 #ifdef DW_LAMBDA |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
961 void ConnectMotionNotify(std::function<int(int, int, int)> userfunc) |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
962 { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
963 _ConnectMotionNotify = userfunc; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
964 if(!MotionNotifyConnected) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
965 dw_signal_connect(hwnd, DW_SIGNAL_MOTION_NOTIFY, DW_SIGNAL_FUNC(_OnMotionNotify), this); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
966 MotionNotifyConnected = true; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
967 } |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
968 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
969 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
970 void ConnectMotionNotify(int (*userfunc)(Render *, int, int, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
971 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
972 _ConnectMotionNotifyOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
973 if(!MotionNotifyConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
974 dw_signal_connect(hwnd, DW_SIGNAL_MOTION_NOTIFY, DW_SIGNAL_FUNC(_OnMotionNotify), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
975 MotionNotifyConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
976 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
977 } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
978 protected: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
979 // Our signal handler functions to be overriden... |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
980 // If they are not overridden and an event is generated, remove the unused handler |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
981 virtual int OnExpose(DWExpose *exp) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
982 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_EXPOSE); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
983 ExposeConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
984 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
985 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
986 virtual int OnConfigure(int width, int height) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
987 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_CONFIGURE); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
988 ConfigureConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
989 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
990 }; |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
991 virtual int OnKeyPress(char c, int vk, int state, std::string utf8) { |
2898
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
992 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_KEY_PRESS); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
993 KeyPressConnected = false; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
994 return FALSE; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
995 }; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
996 virtual int OnButtonPress(char x, int y, int buttonmask) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
997 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_BUTTON_PRESS); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
998 ButtonPressConnected = false; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
999 return FALSE; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1000 }; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1001 virtual int OnButtonRelease(char x, int y, int buttonmask) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1002 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_BUTTON_RELEASE); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1003 ButtonReleaseConnected = false; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1004 return FALSE; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1005 }; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1006 virtual int OnMotionNotify(char x, int y, int buttonmask) { |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1007 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_MOTION_NOTIFY); |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1008 MotionNotifyConnected = false; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1009 return FALSE; |
d53fee198085
C++: Add KeyPress, ButtonPress, ButtonRelease and MotionNotify signals to Render.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2897
diff
changeset
|
1010 }; |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1011 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1012 |
2919
e609aa6a5b93
C++: Attempt to implement page 2 rendering...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2917
diff
changeset
|
1013 class Pixmap final : public Drawable, public Handle |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1014 { |
2877
6f31b7991fa0
C++: Fix Combobox class by making the parent classes virtual.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2876
diff
changeset
|
1015 private: |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1016 void SetHPIXMAP(HPIXMAP newpixmap) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1017 hpixmap = newpixmap; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1018 SetHandle(reinterpret_cast<void *>(newpixmap)); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1019 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1020 HPIXMAP hpixmap; |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1021 unsigned long pwidth, pheight; |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1022 bool hpmprot; |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1023 public: |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1024 // Constructors |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1025 Pixmap(Render *window, unsigned long width, unsigned long height, int depth) { |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1026 SetHPIXMAP(dw_pixmap_new(window ? window->GetHWND() : DW_NOHWND, width, height, depth)); |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1027 pwidth = width; pheight = height; |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1028 hpmprot = false; |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1029 } |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1030 Pixmap(Render *window, unsigned long width, unsigned long height) { |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1031 SetHPIXMAP(dw_pixmap_new(window ? window->GetHWND() : DW_NOHWND, width, height, 32)); |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1032 pwidth = width; pheight = height; |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1033 hpmprot = false; |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1034 } |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1035 Pixmap(Render *window, const char *filename) { |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1036 SetHPIXMAP(dw_pixmap_new_from_file(window ? window->GetHWND() : DW_NOHWND, filename)); |
2950
0577a97fe36d
Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2947
diff
changeset
|
1037 pwidth = dw_pixmap_get_width(hpixmap); |
0577a97fe36d
Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2947
diff
changeset
|
1038 pheight = dw_pixmap_get_height(hpixmap); |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1039 hpmprot = false; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1040 } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1041 Pixmap(Render *window, std::string filename) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1042 SetHPIXMAP(dw_pixmap_new_from_file(window ? window->GetHWND() : DW_NOHWND, filename.c_str())); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1043 pwidth = dw_pixmap_get_width(hpixmap); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1044 pheight = dw_pixmap_get_height(hpixmap); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1045 hpmprot = false; |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1046 } |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1047 Pixmap(HPIXMAP hpm) { |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1048 SetHPIXMAP(hpm); |
2950
0577a97fe36d
Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2947
diff
changeset
|
1049 pwidth = dw_pixmap_get_width(hpixmap); |
0577a97fe36d
Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2947
diff
changeset
|
1050 pheight = dw_pixmap_get_height(hpixmap); |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1051 hpmprot = true; |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1052 } |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1053 // Destructor |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
1054 ~Pixmap() { if(hpmprot == false) dw_pixmap_destroy(hpixmap); hpixmap = 0; } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1055 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1056 // User functions |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1057 HPIXMAP GetHPIXMAP() { return hpixmap; } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1058 void DrawPoint(int x, int y) { dw_draw_point(DW_NOHWND, hpixmap, x, y); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1059 void DrawLine(int x1, int y1, int x2, int y2) { dw_draw_line(DW_NOHWND, hpixmap, x1, y1, x2, y2); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1060 void DrawPolygon(int flags, int npoints, int x[], int y[]) { dw_draw_polygon(DW_NOHWND, hpixmap, flags, npoints, x, y); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1061 void DrawRect(int fill, int x, int y, int width, int height) { dw_draw_rect(DW_NOHWND, hpixmap, fill, x, y, width, height); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1062 void DrawArc(int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2) { dw_draw_arc(DW_NOHWND, hpixmap, flags, xorigin, yorigin, x1, y1, x2, y2); } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1063 void DrawText(int x, int y, const char *text) { dw_draw_text(DW_NOHWND, hpixmap, x, y, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1064 void DrawText(int x, int y, std::string text) { dw_draw_text(DW_NOHWND, hpixmap, x, y, text.c_str()); } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1065 int BitBltStretch(int xdest, int ydest, int width, int height, Render *src, int xsrc, int ysrc, int srcwidth, int srcheight) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1066 return dw_pixmap_stretch_bitblt(DW_NOHWND, hpixmap, xdest, ydest, width, height, src ? src->GetHWND() : DW_NOHWND, DW_NULL, xsrc, ysrc, srcwidth, srcheight); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1067 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1068 int BitBltStretch(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc, int srcwidth, int srcheight) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1069 return dw_pixmap_stretch_bitblt(DW_NOHWND, hpixmap, xdest, ydest, width, height, DW_NOHWND, src ? src->GetHPIXMAP() : DW_NULL, xsrc, ysrc, srcwidth, srcheight); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1070 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1071 void BitBlt(int xdest, int ydest, int width, int height, Render *src, int xsrc, int ysrc) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1072 dw_pixmap_bitblt(DW_NOHWND, hpixmap, xdest, ydest, width, height, src ? src->GetHWND() : DW_NOHWND, DW_NULL, xsrc, ysrc); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1073 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1074 void BitBlt(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc) { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1075 dw_pixmap_bitblt(DW_NOHWND, hpixmap, xdest, ydest, width, height, DW_NOHWND, src ? src->GetHPIXMAP() : DW_NULL, xsrc, ysrc); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1076 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1077 int SetFont(const char *fontname) { return dw_pixmap_set_font(hpixmap, fontname); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1078 int SetFont(std::string fontname) { return dw_pixmap_set_font(hpixmap, fontname.c_str()); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1079 void GetTextExtents(const char *text, int *width, int *height) { dw_font_text_extents_get(DW_NOHWND, hpixmap, text, width, height); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1080 void GetTextExtents(std::string text, int *width, int *height) { dw_font_text_extents_get(DW_NOHWND, hpixmap, text.c_str(), width, height); } |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1081 void SetTransparentColor(unsigned long color) { dw_pixmap_set_transparent_color(hpixmap, color); } |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1082 unsigned long GetWidth() { return pwidth; } |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1083 unsigned long GetHeight() { return pheight; } |
2874
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1084 }; |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1085 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1086 // Need to declare these here after Pixmap is defined |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1087 int Render::BitBltStretch(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc, int srcwidth, int srcheight) |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1088 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1089 return dw_pixmap_stretch_bitblt(hwnd, DW_NULL, xdest, ydest, width, height, DW_NOHWND, src ? src->GetHPIXMAP() : DW_NULL, xsrc, ysrc, srcwidth, srcheight); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1090 } |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1091 |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1092 void Render::BitBlt(int xdest, int ydest, int width, int height, Pixmap *src, int xsrc, int ysrc) |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1093 { |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1094 dw_pixmap_bitblt(hwnd, DW_NULL, xdest, ydest, width, height, DW_NOHWND, src ? src->GetHPIXMAP() : DW_NULL, xsrc, ysrc); |
585d0053b766
C++: Implement buttons, images, render, pixmap and boxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2873
diff
changeset
|
1095 } |
2868
5ee1aaa48fc7
C++: The last signal handler change only worked with Clang/LLVM.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2867
diff
changeset
|
1096 |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1097 // Class for the HTML rendering widget |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1098 class HTML : public Widget |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1099 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1100 private: |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1101 bool ChangedConnected, ResultConnected, MessageConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1102 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1103 std::function<int(int, std::string)> _ConnectChanged; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1104 std::function<int(int, std::string, void *)> _ConnectResult; |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1105 std::function<int(std::string, std::string)> _ConnectMessage; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1106 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1107 int (*_ConnectCChangedOld)(HTML *, int status, char *url); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1108 int (*_ConnectCResultOld)(HTML *, int status, char *result, void *scriptdata); |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1109 int (*_ConnectCMessageOld)(HTML *, char *name, char *message); |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1110 int (*_ConnectChangedOld)(HTML *, int status, std::string url); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1111 int (*_ConnectResultOld)(HTML *, int status, std::string result, void *scriptdata); |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1112 int (*_ConnectMessageOld)(HTML *, std::string, std::string message); |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1113 void Setup() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1114 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1115 _ConnectChanged = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1116 _ConnectResult = 0; |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1117 _ConnectMessage = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1118 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1119 _ConnectCChangedOld = 0; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1120 _ConnectCResultOld = 0; |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1121 _ConnectCMessageOld = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1122 _ConnectChangedOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1123 _ConnectResultOld = 0; |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1124 _ConnectMessageOld = 0; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1125 if(IsOverridden(HTML::OnChanged, this)) { |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1126 dw_signal_connect(hwnd, DW_SIGNAL_HTML_CHANGED, DW_SIGNAL_FUNC(_OnChanged), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1127 ChangedConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1128 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1129 ChangedConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1130 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1131 if(IsOverridden(HTML::OnResult, this)) { |
2936
75f6e21f5a02
C++: Connected the wrong signal for the HTML result, causing crashes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2933
diff
changeset
|
1132 dw_signal_connect(hwnd, DW_SIGNAL_HTML_RESULT, DW_SIGNAL_FUNC(_OnResult), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1133 ResultConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1134 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1135 ResultConnected = false; |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1136 } |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1137 if(IsOverridden(HTML::OnMessage, this)) { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1138 dw_signal_connect(hwnd, DW_SIGNAL_HTML_MESSAGE, DW_SIGNAL_FUNC(_OnMessage), this); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1139 MessageConnected = true; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1140 } else { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1141 MessageConnected = false; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1142 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1143 } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1144 static int _OnChanged(HWND window, int status, char *url, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1145 HTML *classptr = reinterpret_cast<HTML *>(data); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1146 std::string utf8string = url ? std::string(url) : std::string(); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1147 #ifdef DW_LAMBDA |
2962
e6072eb914ce
C++: Step 4 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2961
diff
changeset
|
1148 if(classptr->_ConnectChanged) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1149 return classptr->_ConnectChanged(status, utf8string); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1150 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1151 if(classptr->_ConnectCChangedOld) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1152 return classptr->_ConnectCChangedOld(classptr, status, url); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1153 else if(classptr->_ConnectChangedOld) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1154 return classptr->_ConnectChangedOld(classptr, status, utf8string); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1155 return classptr->OnChanged(status, utf8string); } |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1156 static int _OnResult(HWND window, int status, char *result, void *scriptdata, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1157 HTML *classptr = reinterpret_cast<HTML *>(data); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1158 std::string utf8string = result ? std::string(result) : std::string(); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1159 #ifdef DW_LAMBDA |
2962
e6072eb914ce
C++: Step 4 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2961
diff
changeset
|
1160 if(classptr->_ConnectResult) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1161 return classptr->_ConnectResult(status, utf8string, scriptdata); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1162 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1163 if(classptr->_ConnectCResultOld) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1164 return classptr->_ConnectCResultOld(classptr, status, result, scriptdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1165 else if(classptr->_ConnectResultOld) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1166 return classptr->_ConnectResultOld(classptr, status, utf8string, scriptdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1167 return classptr->OnResult(status, utf8string, scriptdata); } |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1168 static int _OnMessage(HWND window, char *name, char *message, void *data) { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1169 HTML *classptr = reinterpret_cast<HTML *>(data); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1170 std::string utf8name = name ? std::string(name) : std::string(); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1171 std::string utf8message = message ? std::string(message) : std::string(); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1172 #ifdef DW_LAMBDA |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1173 if(classptr->_ConnectMessage) |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1174 return classptr->_ConnectMessage(utf8name, utf8message); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1175 #endif |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1176 if(classptr->_ConnectCMessageOld) |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1177 return classptr->_ConnectCMessageOld(classptr, name, message); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1178 else if(classptr->_ConnectMessageOld) |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1179 return classptr->_ConnectMessageOld(classptr, utf8name, utf8message); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1180 return classptr->OnMessage(utf8name, utf8message); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1181 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1182 // Constructors |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1183 HTML(unsigned long id) { SetHWND(dw_html_new(id)); Setup(); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1184 HTML() { SetHWND(dw_html_new(0)); Setup(); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1185 |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1186 // User functions |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1187 void Action(int action) { dw_html_action(hwnd, action); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1188 int JavascriptRun(const char *script, void *scriptdata) { return dw_html_javascript_run(hwnd, script, scriptdata); } |
2932
3f660f47a45f
C++: Add HTML and ScrollBox pages to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2931
diff
changeset
|
1189 int JavascriptRun(const char *script) { return dw_html_javascript_run(hwnd, script, NULL); } |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1190 int JavascriptAdd(const char *name) { return dw_html_javascript_add(hwnd, name); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1191 int Raw(const char *buffer) { return dw_html_raw(hwnd, buffer); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1192 int URL(const char *url) { return dw_html_url(hwnd, url); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1193 int JavascriptRun(std::string script, void *scriptdata) { return dw_html_javascript_run(hwnd, script.c_str(), scriptdata); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1194 int JavascriptRun(std::string script) { return dw_html_javascript_run(hwnd, script.c_str(), NULL); } |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1195 int JavascriptAdd(std::string name) { return dw_html_javascript_add(hwnd, name.c_str()); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1196 int Raw(std::string buffer) { return dw_html_raw(hwnd, buffer.c_str()); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1197 int URL(std::string url) { return dw_html_url(hwnd, url.c_str()); } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1198 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1199 void ConnectChanged(std::function<int(int, std::string)> userfunc) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1200 { |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1201 _ConnectChanged = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1202 if(!ChangedConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1203 dw_signal_connect(hwnd, DW_SIGNAL_HTML_CHANGED, DW_SIGNAL_FUNC(_OnChanged), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1204 ChangedConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1205 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1206 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1207 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1208 void ConnectChanged(int (*userfunc)(HTML *, int, char *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1209 { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1210 _ConnectCChangedOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1211 if(!ChangedConnected) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1212 dw_signal_connect(hwnd, DW_SIGNAL_HTML_CHANGED, DW_SIGNAL_FUNC(_OnChanged), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1213 ChangedConnected = true; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1214 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1215 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1216 void ConnectChanged(int (*userfunc)(HTML *, int, std::string)) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1217 { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1218 _ConnectChangedOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1219 if(!ChangedConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1220 dw_signal_connect(hwnd, DW_SIGNAL_HTML_CHANGED, DW_SIGNAL_FUNC(_OnChanged), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1221 ChangedConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1222 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1223 } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1224 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1225 void ConnectResult(std::function<int(int, std::string, void *)> userfunc) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1226 { |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1227 _ConnectResult = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1228 if(!ResultConnected) { |
2936
75f6e21f5a02
C++: Connected the wrong signal for the HTML result, causing crashes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2933
diff
changeset
|
1229 dw_signal_connect(hwnd, DW_SIGNAL_HTML_RESULT, DW_SIGNAL_FUNC(_OnResult), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1230 ResultConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1231 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1232 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1233 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1234 void ConnectResult(int (*userfunc)(HTML *, int, char *, void *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1235 { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1236 _ConnectCResultOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1237 if(!ResultConnected) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1238 dw_signal_connect(hwnd, DW_SIGNAL_HTML_RESULT, DW_SIGNAL_FUNC(_OnResult), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1239 ResultConnected = true; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1240 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1241 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1242 void ConnectResult(int (*userfunc)(HTML *, int, std::string, void *)) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1243 { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1244 _ConnectResultOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1245 if(!ResultConnected) { |
2936
75f6e21f5a02
C++: Connected the wrong signal for the HTML result, causing crashes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2933
diff
changeset
|
1246 dw_signal_connect(hwnd, DW_SIGNAL_HTML_RESULT, DW_SIGNAL_FUNC(_OnResult), this); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1247 ResultConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1248 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1249 } |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1250 #ifdef DW_LAMBDA |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1251 void ConnectMessage(std::function<int(std::string, std::string)> userfunc) |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1252 { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1253 _ConnectMessage = userfunc; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1254 if(!MessageConnected) { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1255 dw_signal_connect(hwnd, DW_SIGNAL_HTML_MESSAGE, DW_SIGNAL_FUNC(_OnMessage), this); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1256 MessageConnected = true; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1257 } |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1258 } |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1259 #endif |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1260 void ConnectMessage(int (*userfunc)(HTML *, char *, char *)) |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1261 { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1262 _ConnectCMessageOld = userfunc; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1263 if(!MessageConnected) { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1264 dw_signal_connect(hwnd, DW_SIGNAL_HTML_MESSAGE, DW_SIGNAL_FUNC(_OnMessage), this); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1265 MessageConnected = true; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1266 } |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1267 } |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1268 void ConnectMessage(int (*userfunc)(HTML *, std::string, std::string)) |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1269 { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1270 _ConnectMessageOld = userfunc; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1271 if(!MessageConnected) { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1272 dw_signal_connect(hwnd, DW_SIGNAL_HTML_MESSAGE, DW_SIGNAL_FUNC(_OnMessage), this); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1273 MessageConnected = true; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1274 } |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1275 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1276 protected: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1277 // Our signal handler functions to be overriden... |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1278 // If they are not overridden and an event is generated, remove the unused handler |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1279 virtual int OnChanged(int status, std::string url) { |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1280 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_HTML_CHANGED); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1281 ChangedConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1282 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1283 } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1284 virtual int OnResult(int status, std::string result, void *scriptdata) { |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1285 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_HTML_RESULT); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1286 ResultConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1287 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1288 }; |
2974
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1289 virtual int OnMessage(std::string name, std::string message) { |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1290 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_HTML_MESSAGE); |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1291 MessageConnected = false; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1292 return FALSE; |
fffb4904c90b
Mac: Initial support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2973
diff
changeset
|
1293 }; |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1294 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1295 |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1296 // Base class for several widgets that allow text entry |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
1297 class TextEntry : virtual public Focusable, virtual public TextWidget |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1298 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1299 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1300 // User functions |
2879
ec7f6e28166d
C++: Add Calendar widget and fix an issue in that last commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2878
diff
changeset
|
1301 void ClickDefault(Focusable *next) { if(next) dw_window_click_default(hwnd, next->GetHWND()); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1302 void SetLimit(int limit) { dw_entryfield_set_limit(hwnd, limit);} |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1303 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1304 |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1305 class Entryfield : public TextEntry |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1306 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1307 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1308 // Constructors |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1309 Entryfield(const char *text, unsigned long id) { SetHWND(dw_entryfield_new(text, id)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1310 Entryfield(std::string text, unsigned long id) { SetHWND(dw_entryfield_new(text.c_str(), id)); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1311 Entryfield(unsigned long id) { SetHWND(dw_entryfield_new("", id)); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1312 Entryfield(const char *text) { SetHWND(dw_entryfield_new(text, 0)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1313 Entryfield(std::string text) { SetHWND(dw_entryfield_new(text.c_str(), 0)); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1314 Entryfield() { SetHWND(dw_entryfield_new("", 0)); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1315 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1316 |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1317 class EntryfieldPassword : public TextEntry |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1318 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1319 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1320 // Constructors |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1321 EntryfieldPassword(const char *text, unsigned long id) { SetHWND(dw_entryfield_password_new(text, id)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1322 EntryfieldPassword(std::string text, unsigned long id) { SetHWND(dw_entryfield_password_new(text.c_str(), id)); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1323 EntryfieldPassword(unsigned long id) { SetHWND(dw_entryfield_password_new("", id)); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1324 EntryfieldPassword(const char *text) { SetHWND(dw_entryfield_password_new(text, 0)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1325 EntryfieldPassword(std::string text) { SetHWND(dw_entryfield_password_new(text.c_str(), 0)); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1326 EntryfieldPassword() { SetHWND(dw_entryfield_password_new("", 0)); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1327 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1328 |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1329 // Base class for several widgets that have a list of elements |
2878
a290573a8b7c
C++: Implement StatusText class, reorganize Text widgets to eliminate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2877
diff
changeset
|
1330 class ListBoxes : virtual public Focusable |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1331 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1332 private: |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1333 bool ListSelectConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1334 #ifdef DW_LAMBDA |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1335 std::function<int(unsigned int)> _ConnectListSelect; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1336 #endif |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1337 int (*_ConnectListSelectOld)(ListBoxes *, unsigned int index); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1338 static int _OnListSelect(HWND window, int index, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1339 ListBoxes *classptr = reinterpret_cast<ListBoxes *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1340 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1341 if(classptr->_ConnectListSelect) |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1342 return classptr->_ConnectListSelect((unsigned int)index); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1343 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1344 if(classptr->_ConnectListSelectOld) |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1345 return classptr->_ConnectListSelectOld(classptr, (unsigned int)index); |
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1346 return classptr->OnListSelect((unsigned int)index); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1347 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1348 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1349 // User functions |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1350 void Append(const char *text) { dw_listbox_append(hwnd, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1351 void Append(std::string text) { dw_listbox_append(hwnd, text.c_str()); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1352 void Clear() { dw_listbox_clear(hwnd); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1353 int Count() { return dw_listbox_count(hwnd); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1354 void Delete(int index) { dw_listbox_delete(hwnd, index); } |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1355 void GetListText(unsigned int index, char *buffer, unsigned int length) { dw_listbox_get_text(hwnd, index, buffer, length); } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1356 std::string GetListText(unsigned int index) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1357 int length = 1025; |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1358 char *buffer = (char *)alloca(length); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1359 |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1360 if(buffer) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1361 memset(buffer, 0, length); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1362 dw_listbox_get_text(hwnd, index, buffer, length); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1363 return std::string(buffer); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1364 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1365 return std::string(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1366 } |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1367 void SetListText(unsigned int index, char *buffer) { dw_listbox_set_text(hwnd, index, buffer); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1368 void SetListText(unsigned int index, std::string buffer) { dw_listbox_set_text(hwnd, index, buffer.c_str()); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1369 void Insert(const char *text, int pos) { dw_listbox_insert(hwnd, text, pos); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1370 void Insert(std::string text, int pos) { dw_listbox_insert(hwnd, text.c_str(), pos); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1371 void ListAppend(char **text, int count) { dw_listbox_list_append(hwnd, text, count); } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1372 void ListAppend(std::vector<std::string> text) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1373 int count = (int)text.size(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1374 const char **ctext = (const char **)alloca(sizeof(char *) * count); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1375 |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1376 if(count > 0 && ctext) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1377 for(int z=0; z<count; z++) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1378 ctext[z] = text[z].c_str(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1379 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1380 dw_listbox_list_append(hwnd, (char **)ctext, count); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1381 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1382 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1383 void Select(int index, int state) { dw_listbox_select(hwnd, index, state); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1384 int Selected() { return dw_listbox_selected(hwnd); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1385 int Selected(int where) { return dw_listbox_selected_multi(hwnd, where); } |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1386 void SetTop(int top) { dw_listbox_set_top(hwnd, top); } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1387 #ifdef DW_LAMBDA |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1388 void ConnectListSelect(std::function<int(unsigned int)> userfunc) |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1389 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1390 _ConnectListSelect = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1391 if(!ListSelectConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1392 dw_signal_connect(hwnd, DW_SIGNAL_LIST_SELECT, DW_SIGNAL_FUNC(_OnListSelect), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1393 ListSelectConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1394 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1395 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1396 #endif |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1397 void ConnectListSelect(int (*userfunc)(ListBoxes *, unsigned int)) |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1398 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1399 _ConnectListSelectOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1400 if(!ListSelectConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1401 dw_signal_connect(hwnd, DW_SIGNAL_LIST_SELECT, DW_SIGNAL_FUNC(_OnListSelect), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1402 ListSelectConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1403 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1404 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1405 protected: |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1406 void Setup() { |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1407 #ifdef DW_LAMBDA |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1408 _ConnectListSelect = 0; |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1409 #endif |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1410 _ConnectListSelectOld = 0; |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1411 if(IsOverridden(ListBoxes::OnListSelect, this)) { |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1412 dw_signal_connect(hwnd, DW_SIGNAL_LIST_SELECT, DW_SIGNAL_FUNC(_OnListSelect), this); |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1413 ListSelectConnected = true; |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1414 } |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1415 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1416 // Our signal handler functions to be overriden... |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1417 // If they are not overridden and an event is generated, remove the unused handler |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1418 virtual int OnListSelect(unsigned int index) { |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1419 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_LIST_SELECT); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1420 ListSelectConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1421 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1422 } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1423 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1424 |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1425 class ComboBox : public TextEntry, public ListBoxes |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1426 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1427 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1428 // Constructors |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1429 ComboBox(const char *text, unsigned long id) { SetHWND(dw_combobox_new(text, id)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1430 ComboBox(std::string text, unsigned long id) { SetHWND(dw_combobox_new(text.c_str(), id)); Setup(); } |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1431 ComboBox(unsigned long id) { SetHWND(dw_combobox_new("", id)); Setup(); } |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1432 ComboBox(const char *text) { SetHWND(dw_combobox_new(text, 0)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1433 ComboBox(std::string text) { SetHWND(dw_combobox_new(text.c_str(), 0)); Setup(); } |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1434 ComboBox() { SetHWND(dw_combobox_new("", 0)); Setup(); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1435 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1436 |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1437 class ListBox : public ListBoxes |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1438 { |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1439 public: |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1440 // Constructors |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1441 ListBox(unsigned long id, int multi) { SetHWND(dw_listbox_new(id, multi)); Setup(); } |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1442 ListBox(unsigned long id) { SetHWND(dw_listbox_new(id, FALSE)); Setup(); } |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1443 ListBox(int multi) { SetHWND(dw_listbox_new(0, multi)); Setup(); } |
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
1444 ListBox() { SetHWND(dw_listbox_new(0, FALSE)); Setup(); } |
2876
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1445 }; |
e201a984d855
C++: Implement Entryfield, EntryfieldPassword, Listbox and HTML widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2874
diff
changeset
|
1446 |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1447 // Base class for several ranged type widgets |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1448 class Ranged : virtual public Widget |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1449 { |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1450 private: |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1451 bool ValueChangedConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1452 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1453 std::function<int(int)> _ConnectValueChanged; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1454 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1455 int (*_ConnectValueChangedOld)(Ranged *, int value); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1456 static int _OnValueChanged(HWND window, int value, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1457 Ranged *classptr = reinterpret_cast<Ranged *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1458 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1459 if(classptr->_ConnectValueChanged) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1460 return classptr->_ConnectValueChanged(value); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1461 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1462 if(classptr->_ConnectValueChangedOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1463 return classptr->_ConnectValueChangedOld(classptr, value); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1464 return classptr->OnValueChanged(value); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1465 } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1466 protected: |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1467 void Setup() { |
2924
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
1468 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1469 _ConnectValueChanged = 0; |
2924
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
1470 #endif |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
1471 _ConnectValueChangedOld = 0; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1472 if(IsOverridden(Ranged::OnValueChanged, this)) { |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1473 dw_signal_connect(hwnd, DW_SIGNAL_VALUE_CHANGED, DW_SIGNAL_FUNC(_OnValueChanged), this); |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1474 ValueChangedConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1475 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1476 ValueChangedConnected = false; |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1477 } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1478 } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1479 // Our signal handler functions to be overriden... |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1480 // If they are not overridden and an event is generated, remove the unused handler |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1481 virtual int OnValueChanged(int value) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1482 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_VALUE_CHANGED); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1483 ValueChangedConnected = false; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1484 return FALSE; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1485 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1486 public: |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1487 #ifdef DW_LAMBDA |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1488 void ConnectValueChanged(std::function<int(int)> userfunc) |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1489 { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1490 _ConnectValueChanged = userfunc; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1491 if(!ValueChangedConnected) { |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1492 dw_signal_connect(hwnd, DW_SIGNAL_VALUE_CHANGED, DW_SIGNAL_FUNC(_OnValueChanged), this); |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1493 ValueChangedConnected = true; |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1494 } |
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
1495 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1496 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1497 void ConnectValueChanged(int (*userfunc)(Ranged *, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1498 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1499 _ConnectValueChangedOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1500 if(!ValueChangedConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1501 dw_signal_connect(hwnd, DW_SIGNAL_VALUE_CHANGED, DW_SIGNAL_FUNC(_OnValueChanged), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1502 ValueChangedConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1503 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1504 } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1505 }; |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1506 |
2931
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1507 class Percent : public Widget |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1508 { |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1509 public: |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1510 // Constructors |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1511 Percent(unsigned long id) { SetHWND(dw_percent_new(id)); } |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1512 Percent() { SetHWND(dw_percent_new(0)); } |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1513 |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1514 // User functions |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1515 void SetPos(unsigned int position) { dw_percent_set_pos(hwnd, position); } |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1516 }; |
30c1f37713b6
C++: Add page 5 - Buttons to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2930
diff
changeset
|
1517 |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1518 class Slider : public Ranged |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1519 { |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1520 public: |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1521 // Constructors |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1522 Slider(int orient, int increments, unsigned long id) { SetHWND(dw_slider_new(orient, increments, id)); Setup(); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1523 Slider(int orient, int increments) { SetHWND(dw_slider_new(orient, increments, 0)); Setup(); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1524 |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1525 // User functions |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1526 unsigned int GetPos() { return dw_slider_get_pos(hwnd); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1527 void SetPos(unsigned int position) { dw_slider_set_pos(hwnd, position); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1528 }; |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1529 |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1530 class ScrollBar : public Ranged |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1531 { |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1532 public: |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1533 // Constructors |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1534 ScrollBar(int orient, unsigned long id) { SetHWND(dw_scrollbar_new(orient, id)); Setup(); } |
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
1535 ScrollBar(int orient) { SetHWND(dw_scrollbar_new(orient, 0)); Setup(); } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1536 |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1537 // User functions |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1538 unsigned int GetPos() { return dw_scrollbar_get_pos(hwnd); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1539 void SetPos(unsigned int position) { dw_scrollbar_set_pos(hwnd, position); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1540 void SetRange(unsigned int range, unsigned int visible) { dw_scrollbar_set_range(hwnd, range, visible); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1541 }; |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1542 |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1543 class SpinButton : public Ranged, public TextEntry |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1544 { |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1545 public: |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1546 // Constructors |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1547 SpinButton(const char *text, unsigned long id) { SetHWND(dw_spinbutton_new(text, id)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1548 SpinButton(std::string text, unsigned long id) { SetHWND(dw_spinbutton_new(text.c_str(), id)); Setup(); } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1549 SpinButton(unsigned long id) { SetHWND(dw_spinbutton_new("", id)); Setup(); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1550 SpinButton(const char *text) { SetHWND(dw_spinbutton_new(text, 0)); Setup(); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1551 SpinButton(std::string text) { SetHWND(dw_spinbutton_new(text.c_str(), 0)); Setup(); } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1552 SpinButton() { SetHWND(dw_spinbutton_new("", 0)); Setup(); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1553 |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1554 // User functions |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1555 long GetPos() { return dw_spinbutton_get_pos(hwnd); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1556 void SetPos(long position) { dw_spinbutton_set_pos(hwnd, position); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1557 void SetLimits(long upper, long lower) { dw_spinbutton_set_limits(hwnd, upper, lower); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1558 }; |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1559 |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1560 // Multi-line Edit widget |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1561 class MLE : public Focusable |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1562 { |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1563 public: |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1564 // Constructors |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1565 MLE(unsigned long id) { SetHWND(dw_mle_new(id)); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1566 MLE() { SetHWND(dw_mle_new(0)); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1567 |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1568 // User functions |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1569 void Freeze() { dw_mle_freeze(hwnd); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1570 void Thaw() { dw_mle_thaw(hwnd); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1571 void Clear() { dw_mle_clear(hwnd); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1572 void Delete(int startpoint, int length) { dw_mle_delete(hwnd, startpoint, length); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1573 void Export(char *buffer, int startpoint, int length) { dw_mle_export(hwnd, buffer, startpoint, length); } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1574 std::string Export(int startpoint, int length) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1575 char *buffer = (char *)alloca(length + 1); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1576 |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1577 if(buffer) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1578 memset(buffer, 0, length + 1); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1579 dw_mle_export(hwnd, buffer, startpoint, length); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1580 return std::string(buffer); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1581 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1582 return std::string(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1583 } |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1584 int Import(const char *buffer, int startpoint) { return dw_mle_import(hwnd, buffer, startpoint); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1585 int Import(std::string buffer, int startpoint) { return dw_mle_import(hwnd, buffer.c_str(), startpoint); } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1586 void GetSize(unsigned long *bytes, unsigned long *lines) { dw_mle_get_size(hwnd, bytes, lines); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1587 void Search(const char *text, int point, unsigned long flags) { dw_mle_search(hwnd, text, point, flags); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1588 void Search(std::string text, int point, unsigned long flags) { dw_mle_search(hwnd, text.c_str(), point, flags); } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1589 void SetAutoComplete(int state) { dw_mle_set_auto_complete(hwnd, state); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1590 void SetCursor(int point) { dw_mle_set_cursor(hwnd, point); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1591 void SetEditable(int state) { dw_mle_set_editable(hwnd, state); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1592 void SetVisible(int line) { dw_mle_set_visible(hwnd, line); } |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1593 void SetWordWrap(int state) { dw_mle_set_word_wrap(hwnd, state); } |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1594 int SetFont(const char *font) { return dw_window_set_font(hwnd, font); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1595 int SetFont(std::string font) { return dw_window_set_font(hwnd, font.c_str()); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1596 char *GetCFont() { return dw_window_get_font(hwnd); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1597 std::string GetFont() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1598 char *retval = dw_window_get_font(hwnd); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1599 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1600 } |
2880
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1601 }; |
2ba0959eb3cf
C++: Implement Slider, Scrollbar, SpinButton, and MLE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2879
diff
changeset
|
1602 |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1603 class Notebook : public Widget |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1604 { |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1605 private: |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1606 bool SwitchPageConnected; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1607 #ifdef DW_LAMBDA |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1608 std::function<int(unsigned long)> _ConnectSwitchPage; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1609 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1610 int (*_ConnectSwitchPageOld)(Notebook *, unsigned long); |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1611 static int _OnSwitchPage(HWND window, unsigned long pageid, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1612 Notebook *classptr = reinterpret_cast<Notebook *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1613 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1614 if(classptr->_ConnectSwitchPage) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1615 return classptr->_ConnectSwitchPage(pageid); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1616 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1617 if(classptr->_ConnectSwitchPageOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1618 return classptr->_ConnectSwitchPageOld(classptr, pageid); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1619 return classptr->OnSwitchPage(pageid); |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1620 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1621 protected: |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1622 void Setup() { |
2924
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
1623 #ifdef DW_LAMBDA |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1624 _ConnectSwitchPage = 0; |
2924
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
1625 #endif |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
1626 _ConnectSwitchPageOld = 0; |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1627 if(IsOverridden(Notebook::OnSwitchPage, this)) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1628 dw_signal_connect(hwnd, DW_SIGNAL_SWITCH_PAGE, DW_SIGNAL_FUNC(_OnSwitchPage), this); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1629 SwitchPageConnected = true; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1630 } else { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1631 SwitchPageConnected = false; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1632 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1633 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1634 // Our signal handler functions to be overriden... |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1635 // If they are not overridden and an event is generated, remove the unused handler |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1636 virtual int OnSwitchPage(unsigned long pageid) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1637 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_SWITCH_PAGE); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1638 SwitchPageConnected = false; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1639 return FALSE; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1640 } |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1641 public: |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1642 // Constructors |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1643 Notebook(unsigned long id, int top) { SetHWND(dw_notebook_new(id, top)); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1644 Notebook(unsigned long id) { SetHWND(dw_notebook_new(id, TRUE)); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1645 Notebook() { SetHWND(dw_notebook_new(0, TRUE)); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1646 |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1647 // User functions |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1648 void Pack(unsigned long pageid, Widget *page) { dw_notebook_pack(hwnd, pageid, page ? page->GetHWND() : DW_NOHWND); } |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1649 void PageDestroy(unsigned long pageid) { dw_notebook_page_destroy(hwnd, pageid); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1650 unsigned long PageGet() { return dw_notebook_page_get(hwnd); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1651 unsigned long PageNew(unsigned long flags, int front) { return dw_notebook_page_new(hwnd, flags, front); } |
2920
c6b699a441fe
C++: Fix a couple minor errors while attempting to fix Mac crash.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2919
diff
changeset
|
1652 unsigned long PageNew(unsigned long flags) { return dw_notebook_page_new(hwnd, flags, FALSE); } |
c6b699a441fe
C++: Fix a couple minor errors while attempting to fix Mac crash.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2919
diff
changeset
|
1653 unsigned long PageNew() { return dw_notebook_page_new(hwnd, 0, FALSE); } |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1654 void PageSet(unsigned long pageid) { dw_notebook_page_set(hwnd, pageid); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1655 void PageSetStatusText(unsigned long pageid, const char *text) { dw_notebook_page_set_status_text(hwnd, pageid, text); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1656 void PageSetText(unsigned long pageid, const char *text) { dw_notebook_page_set_text(hwnd, pageid, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1657 void PageSetStatusText(unsigned long pageid, std::string text) { dw_notebook_page_set_status_text(hwnd, pageid, text.c_str()); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1658 void PageSetText(unsigned long pageid, std::string text) { dw_notebook_page_set_text(hwnd, pageid, text.c_str()); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1659 #ifdef DW_LAMBDA |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1660 void ConnectSwitchPage(std::function<int(unsigned long)> userfunc) |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1661 { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1662 _ConnectSwitchPage = userfunc; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1663 if(!SwitchPageConnected) { |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1664 dw_signal_connect(hwnd, DW_SIGNAL_SWITCH_PAGE, DW_SIGNAL_FUNC(_OnSwitchPage), this); |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1665 SwitchPageConnected = true; |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1666 } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1667 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1668 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1669 void ConnectSwitchPage(int (*userfunc)(Notebook *, unsigned long)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1670 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1671 _ConnectSwitchPageOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1672 if(!SwitchPageConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1673 dw_signal_connect(hwnd, DW_SIGNAL_SWITCH_PAGE, DW_SIGNAL_FUNC(_OnSwitchPage), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1674 SwitchPageConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1675 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1676 } |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1677 }; |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
1678 |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1679 class ObjectView : virtual public Widget |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1680 { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1681 private: |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1682 bool ItemSelectConnected, ItemContextConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1683 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1684 std::function<int(HTREEITEM, std::string, void *)> _ConnectItemSelect; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1685 std::function<int(std::string, int, int, void *)> _ConnectItemContext; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1686 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1687 int (*_ConnectCItemSelectOld)(ObjectView *, HTREEITEM, char *, void *); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1688 int (*_ConnectCItemContextOld)(ObjectView *, char *, int, int, void *); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1689 int (*_ConnectItemSelectOld)(ObjectView *, HTREEITEM, std::string, void *); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1690 int (*_ConnectItemContextOld)(ObjectView *, std::string, int, int, void *); |
2937
cacb6610abfc
C++: Fix incorrect parameter order in Container/Tree select causing crashes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2936
diff
changeset
|
1691 static int _OnItemSelect(HWND window, HTREEITEM item, char *text, void *data, void *itemdata) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1692 ObjectView *classptr = reinterpret_cast<ObjectView *>(data); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1693 std::string utf8string = text ? std::string(text) : std::string(); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1694 #ifdef DW_LAMBDA |
2962
e6072eb914ce
C++: Step 4 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2961
diff
changeset
|
1695 if(classptr->_ConnectItemSelect) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1696 return classptr->_ConnectItemSelect(item, utf8string, itemdata); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1697 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1698 if(classptr->_ConnectItemSelectOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1699 return classptr->_ConnectItemSelectOld(classptr, item, text, itemdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1700 else if(classptr->_ConnectItemSelectOld) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1701 return classptr->_ConnectItemSelectOld(classptr, item, utf8string, itemdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1702 return classptr->OnItemSelect(item, utf8string, itemdata); |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1703 } |
2939
ebbc5b16899e
C++: Another couple fixes, context menus and PackAtIndex that got lost during porting.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2938
diff
changeset
|
1704 static int _OnItemContext(HWND window, char *text, int x, int y, void *data, void *itemdata) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1705 ObjectView *classptr = reinterpret_cast<ObjectView *>(data); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1706 std::string utf8string = text ? std::string(text) : std::string(); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1707 #ifdef DW_LAMBDA |
2962
e6072eb914ce
C++: Step 4 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2961
diff
changeset
|
1708 if(classptr->_ConnectItemContext) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1709 return classptr->_ConnectItemContext(utf8string, x, y, itemdata); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1710 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1711 if(classptr->_ConnectCItemContextOld) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1712 return classptr->_ConnectCItemContextOld(classptr, text, x, y, itemdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1713 else if(classptr->_ConnectItemContextOld) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1714 return classptr->_ConnectItemContextOld(classptr, utf8string, x, y, itemdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1715 return classptr->OnItemContext(utf8string, x, y, itemdata); |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1716 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1717 protected: |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1718 void SetupObjectView() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1719 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1720 _ConnectItemSelect = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1721 _ConnectItemContext = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1722 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1723 _ConnectCItemSelectOld = 0; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1724 _ConnectCItemContextOld = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1725 _ConnectItemSelectOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1726 _ConnectItemContextOld = 0; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1727 if(IsOverridden(ObjectView::OnItemSelect, this)) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1728 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_SELECT, DW_SIGNAL_FUNC(_OnItemSelect), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1729 ItemSelectConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1730 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1731 ItemSelectConnected = false; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1732 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1733 if(IsOverridden(ObjectView::OnItemContext, this)) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1734 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_CONTEXT, DW_SIGNAL_FUNC(_OnItemContext), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1735 ItemContextConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1736 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1737 ItemContextConnected = false; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1738 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1739 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1740 // Our signal handler functions to be overriden... |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1741 // If they are not overridden and an event is generated, remove the unused handler |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1742 virtual int OnItemSelect(HTREEITEM item, std::string text, void *itemdata) { |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1743 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_ITEM_SELECT); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1744 ItemSelectConnected = false; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1745 return FALSE; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1746 } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1747 virtual int OnItemContext(std::string text, int x, int y, void *itemdata) { |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1748 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_ITEM_CONTEXT); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1749 ItemContextConnected = false; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1750 return FALSE; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1751 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1752 public: |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1753 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1754 void ConnectItemSelect(std::function<int(HTREEITEM, std::string, void *)> userfunc) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1755 { |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1756 _ConnectItemSelect = userfunc; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1757 if(!ItemSelectConnected) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1758 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_SELECT, DW_SIGNAL_FUNC(_OnItemSelect), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1759 ItemSelectConnected = true; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1760 } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
1761 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1762 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1763 void ConnectItemSelect(int (*userfunc)(ObjectView *, HTREEITEM, char *, void *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1764 { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1765 _ConnectCItemSelectOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1766 if(!ItemSelectConnected) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1767 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_SELECT, DW_SIGNAL_FUNC(_OnItemSelect), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1768 ItemSelectConnected = true; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1769 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1770 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1771 void ConnectItemSelect(int (*userfunc)(ObjectView *, HTREEITEM, std::string, void *)) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1772 { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1773 _ConnectItemSelectOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1774 if(!ItemSelectConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1775 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_SELECT, DW_SIGNAL_FUNC(_OnItemSelect), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1776 ItemSelectConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1777 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1778 } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1779 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1780 void ConnectItemContext(std::function<int(std::string, int, int, void *)> userfunc) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1781 { |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1782 _ConnectItemContext = userfunc; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1783 if(!ItemContextConnected) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1784 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_CONTEXT, DW_SIGNAL_FUNC(_OnItemContext), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1785 ItemContextConnected = true; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1786 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1787 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1788 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1789 void ConnectItemContext(int (*userfunc)(ObjectView *, char *, int, int, void *)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1790 { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1791 _ConnectCItemContextOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1792 if(!ItemContextConnected) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1793 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_CONTEXT, DW_SIGNAL_FUNC(_OnItemContext), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1794 ItemContextConnected = true; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1795 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1796 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1797 void ConnectItemContext(int (*userfunc)(ObjectView *, std::string, int, int, void *)) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1798 { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1799 _ConnectItemContextOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1800 if(!ItemContextConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1801 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_CONTEXT, DW_SIGNAL_FUNC(_OnItemContext), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1802 ItemContextConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1803 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1804 } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1805 }; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1806 |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1807 class Containers : virtual public Focusable, virtual public ObjectView |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1808 { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1809 private: |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1810 bool ItemEnterConnected, ColumnClickConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1811 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1812 std::function<int(std::string, void *)> _ConnectItemEnter; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1813 std::function<int(int)> _ConnectColumnClick; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1814 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1815 int (*_ConnectCItemEnterOld)(Containers *, char *, void *); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1816 int (*_ConnectItemEnterOld)(Containers *, std::string, void *); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1817 int (*_ConnectColumnClickOld)(Containers *, int); |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1818 static int _OnItemEnter(HWND window, char *text, void *data, void *itemdata) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1819 Containers *classptr = reinterpret_cast<Containers *>(data); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1820 std::string utf8string = text ? std::string(text) : std::string(); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1821 #ifdef DW_LAMBDA |
2962
e6072eb914ce
C++: Step 4 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2961
diff
changeset
|
1822 if(classptr->_ConnectItemEnter) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1823 return classptr->_ConnectItemEnter(utf8string, itemdata); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1824 #endif |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1825 if(classptr->_ConnectCItemEnterOld) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1826 return classptr->_ConnectCItemEnterOld(classptr, text, itemdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1827 else if(classptr->_ConnectItemEnterOld) |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1828 return classptr->_ConnectItemEnterOld(classptr, utf8string, itemdata); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1829 return classptr->OnItemEnter(utf8string, itemdata); |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1830 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1831 static int _OnColumnClick(HWND window, int column, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1832 Containers *classptr = reinterpret_cast<Containers *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1833 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1834 if(classptr->_ConnectColumnClick) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1835 return classptr->_ConnectColumnClick(column); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1836 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1837 if(classptr->_ConnectColumnClickOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1838 return classptr->_ConnectColumnClickOld(classptr, column); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1839 return classptr->OnColumnClick(column); |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1840 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1841 protected: |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1842 void *allocpointer; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1843 int allocrowcount; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1844 void SetupContainer() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1845 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1846 _ConnectItemEnter = 0; |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1847 _ConnectColumnClick = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1848 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1849 _ConnectItemEnterOld = 0; |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1850 _ConnectCItemEnterOld = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1851 _ConnectColumnClickOld = 0; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1852 if(IsOverridden(Container::OnItemEnter, this)) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1853 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_ENTER, DW_SIGNAL_FUNC(_OnItemEnter), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1854 ItemEnterConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1855 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1856 ItemEnterConnected = false; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1857 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1858 if(IsOverridden(Container::OnColumnClick, this)) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1859 dw_signal_connect(hwnd, DW_SIGNAL_COLUMN_CLICK, DW_SIGNAL_FUNC(_OnColumnClick), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1860 ColumnClickConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1861 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
1862 ColumnClickConnected = false; |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1863 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1864 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1865 // Our signal handler functions to be overriden... |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1866 // If they are not overridden and an event is generated, remove the unused handler |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1867 virtual int OnItemEnter(std::string text, void *itemdata) { |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1868 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_ITEM_ENTER); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1869 ItemEnterConnected = false; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1870 return FALSE; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1871 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1872 virtual int OnColumnClick(int column) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1873 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_COLUMN_CLICK); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1874 ColumnClickConnected = false; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1875 return FALSE; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1876 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1877 public: |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1878 // User functions |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1879 void Alloc(int rowcount) { allocpointer = dw_container_alloc(hwnd, rowcount); allocrowcount = rowcount; } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1880 void ChangeRowTitle(int row, char *title) { dw_container_change_row_title(hwnd, row, title); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1881 void ChangeRowTitle(int row, std::string title) { dw_container_change_row_title(hwnd, row, title.c_str()); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1882 void Clear(int redraw) { dw_container_clear(hwnd, redraw); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1883 void Clear() { dw_container_clear(hwnd, TRUE); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1884 void Cursor(const char *text) { dw_container_cursor(hwnd, text); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1885 void Cursor(std::string text) { dw_container_cursor(hwnd, text.c_str()); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1886 void Cursor(void *data) { dw_container_cursor_by_data(hwnd, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1887 void Delete(int rowcount) { dw_container_delete(hwnd, rowcount); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1888 void DeleteRow(char *title) { dw_container_delete_row(hwnd, title); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1889 void DeleteRow(std::string title) { dw_container_delete_row(hwnd, title.c_str()); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1890 void DeleteRow(void *data) { dw_container_delete_row_by_data(hwnd, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1891 void Insert() { dw_container_insert(hwnd, allocpointer, allocrowcount); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1892 void Optimize() { dw_container_optimize(hwnd); } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1893 char *QueryCNext(unsigned long flags) { return dw_container_query_next(hwnd, flags); } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1894 char *QueryCStart(unsigned long flags) { return dw_container_query_start(hwnd, flags); } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1895 std::string QueryNext(unsigned long flags) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1896 char *retval = dw_container_query_next(hwnd, flags); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1897 return retval ? std::string(retval) : std::string(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1898 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1899 std::string QueryStart(unsigned long flags) { |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1900 char *retval = dw_container_query_start(hwnd, flags); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1901 return retval ? std::string(retval) : std::string(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1902 } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1903 void Scroll(int direction, long rows) { dw_container_scroll(hwnd, direction, rows); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1904 void SetColumnWidth(int column, int width) { dw_container_set_column_width(hwnd, column, width); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1905 void SetRowData(int row, void *data) { dw_container_set_row_data(allocpointer, row, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1906 void SetRowTitle(int row, const char *title) { dw_container_set_row_title(allocpointer, row, title); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
1907 void SetRowTitle(int row, const std::string title) { dw_container_set_row_title(allocpointer, row, title.c_str()); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1908 void SetStripe(unsigned long oddcolor, unsigned long evencolor) { dw_container_set_stripe(hwnd, oddcolor, evencolor); } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1909 #ifdef DW_LAMBDA |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1910 void ConnectItemEnter(std::function<int(std::string, void *)> userfunc) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1911 { |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1912 _ConnectItemEnter = userfunc; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1913 if(!ItemEnterConnected) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1914 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_ENTER, DW_SIGNAL_FUNC(_OnItemEnter), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1915 ItemEnterConnected = true; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1916 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1917 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1918 #endif |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1919 void ConnectItemEnter(int (*userfunc)(Containers *, char *, void *)) |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1920 { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1921 _ConnectCItemEnterOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1922 if(!ItemEnterConnected) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1923 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_ENTER, DW_SIGNAL_FUNC(_OnItemEnter), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1924 ItemEnterConnected = true; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1925 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1926 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1927 void ConnectItemEnter(int (*userfunc)(Containers *, std::string, void *)) |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
1928 { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1929 _ConnectItemEnterOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1930 if(!ItemEnterConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1931 dw_signal_connect(hwnd, DW_SIGNAL_ITEM_ENTER, DW_SIGNAL_FUNC(_OnItemEnter), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1932 ItemEnterConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1933 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1934 } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
1935 #ifdef DW_LAMBDA |
2930
d8117d36ed27
C++: Add Page 4 - Container to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2929
diff
changeset
|
1936 void ConnectColumnClick(std::function<int(int)> userfunc) |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1937 { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1938 _ConnectColumnClick = userfunc; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1939 if(!ColumnClickConnected) { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1940 dw_signal_connect(hwnd, DW_SIGNAL_COLUMN_CLICK, DW_SIGNAL_FUNC(_OnColumnClick), this); |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1941 ColumnClickConnected = true; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1942 } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1943 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1944 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1945 void ConnectColumnClick(int (*userfunc)(Containers *, int)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1946 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1947 _ConnectColumnClickOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1948 if(!ColumnClickConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1949 dw_signal_connect(hwnd, DW_SIGNAL_COLUMN_CLICK, DW_SIGNAL_FUNC(_OnColumnClick), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1950 ColumnClickConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1951 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
1952 } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1953 }; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1954 |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1955 class Container : public Containers |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1956 { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1957 public: |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1958 // Constructors |
2941
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1959 Container(unsigned long id, int multi) { SetHWND(dw_container_new(id, multi)); } |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1960 Container(int multi) { SetHWND(dw_container_new(0, multi)); } |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1961 Container() { SetHWND(dw_container_new(0, FALSE)); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1962 |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1963 // User functions |
2941
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1964 int Setup(unsigned long *flags, const char *titles[], int count, int separator) { |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1965 int retval = dw_container_setup(hwnd, flags, (char **)titles, count, separator); |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1966 SetupObjectView(); SetupContainer(); |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1967 return retval; |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1968 } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1969 void ChangeItem(int column, int row, void *data) { dw_container_change_item(hwnd, column, row, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1970 int GetColumnType(int column) { return dw_container_get_column_type(hwnd, column); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1971 void SetItem(int column, int row, void *data) { dw_container_set_item(hwnd, allocpointer, column, row, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1972 }; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1973 |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1974 class Filesystem : public Containers |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1975 { |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1976 public: |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1977 // Constructors |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1978 Filesystem(unsigned long id, int multi) { SetHWND(dw_container_new(id, multi)); SetupObjectView(); SetupContainer(); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1979 Filesystem(int multi) { SetHWND(dw_container_new(0, multi)); SetupObjectView(); SetupContainer(); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1980 Filesystem() { SetHWND(dw_container_new(0, FALSE)); SetupObjectView(); SetupContainer(); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1981 |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
1982 // User functions |
2941
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1983 int Setup(unsigned long *flags, const char *titles[], int count) { |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1984 int retval = dw_filesystem_setup(hwnd, flags, (char **)titles, count); |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1985 SetupObjectView(); SetupContainer(); |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1986 return retval; |
7a057db0bd36
C++: Fix Container signals on GTK by moving the signal setup...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2940
diff
changeset
|
1987 } |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1988 int Setup(std::vector<unsigned long> flags, std::vector<std::string> titles) { |
2964
2d9521396112
C++: Step 6 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2962
diff
changeset
|
1989 unsigned int count = flags.size(); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1990 |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1991 // Use the smallest of the two lists |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1992 if(count > titles.size()) { |
2964
2d9521396112
C++: Step 6 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2962
diff
changeset
|
1993 count = titles.size(); |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1994 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1995 // Convert our vectors into a arrays of unsigned long and C strings |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1996 const char **ctitles = (const char **)alloca(sizeof(char *) * count); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1997 unsigned long *cflags = (unsigned long *)alloca(sizeof(unsigned long) * count); |
2964
2d9521396112
C++: Step 6 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2962
diff
changeset
|
1998 for(unsigned int z=0; z<count; z++) { |
2961
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
1999 ctitles[z] = titles[z].c_str(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
2000 cflags[z] = flags[z]; |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
2001 } |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
2002 int retval = dw_filesystem_setup(hwnd, cflags, (char **)ctitles, count); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
2003 SetupObjectView(); SetupContainer(); |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
2004 return retval; |
b9bd130f438a
C++: Step 3 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2960
diff
changeset
|
2005 } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2006 void ChangeFile(int row, const char *filename, HICN icon) { dw_filesystem_change_file(hwnd, row, filename, icon); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2007 void ChangeFile(int row, std::string filename, HICN icon) { dw_filesystem_change_file(hwnd, row, filename.c_str(), icon); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2008 void ChangeItem(int column, int row, void *data) { dw_filesystem_change_item(hwnd, column, row, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2009 int GetColumnType(int column) { return dw_filesystem_get_column_type(hwnd, column); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2010 void SetColumnTitle(const char *title) { dw_filesystem_set_column_title(hwnd, title); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2011 void SetColumnTitle(std::string title) { dw_filesystem_set_column_title(hwnd, title.c_str()); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2012 void SetFile(int row, const char *filename, HICN icon) { dw_filesystem_set_file(hwnd, allocpointer, row, filename, icon); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2013 void SetFile(int row, std::string filename, HICN icon) { dw_filesystem_set_file(hwnd, allocpointer, row, filename.c_str(), icon); } |
2892
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2014 void SetItem(int column, int row, void *data) { dw_filesystem_set_item(hwnd, allocpointer, column, row, data); } |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2015 }; |
387a6242fa77
C++: Add the Container and Filesystem classes, plus the base for Tree.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2891
diff
changeset
|
2016 |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2017 class Tree : virtual public Focusable, virtual public ObjectView |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2018 { |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2019 private: |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2020 bool TreeExpandConnected; |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
2021 #ifdef DW_LAMBDA |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2022 std::function<int(HTREEITEM)> _ConnectTreeExpand; |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2023 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2024 int (*_ConnectTreeExpandOld)(Tree *, HTREEITEM); |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2025 static int _OnTreeExpand(HWND window, HTREEITEM item, void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2026 Tree *classptr = reinterpret_cast<Tree *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2027 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2028 if(classptr->_ConnectTreeExpand) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2029 return classptr->_ConnectTreeExpand(item); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2030 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2031 if(classptr->_ConnectTreeExpandOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2032 return classptr->_ConnectTreeExpandOld(classptr, item); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2033 return classptr->OnTreeExpand(item); |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2034 } |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
2035 void SetupTree() { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2036 #ifdef DW_LAMBDA |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
2037 _ConnectTreeExpand = 0; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2038 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2039 _ConnectTreeExpandOld = 0; |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2040 if(IsOverridden(Tree::OnTreeExpand, this)) { |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2041 dw_signal_connect(hwnd, DW_SIGNAL_TREE_EXPAND, DW_SIGNAL_FUNC(_OnTreeExpand), this); |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2042 TreeExpandConnected = true; |
2903
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
2043 } else { |
9fd16f694a77
C++: MSVC does not seem to initialize the class fields...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2901
diff
changeset
|
2044 TreeExpandConnected = false; |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2045 } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2046 } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2047 protected: |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2048 // Our signal handler functions to be overriden... |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2049 // If they are not overridden and an event is generated, remove the unused handler |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2050 virtual int OnTreeExpand(HTREEITEM item) { |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2051 dw_signal_disconnect_by_name(hwnd, DW_SIGNAL_TREE_EXPAND); |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2052 TreeExpandConnected = false; |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2053 return FALSE; |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2054 } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2055 public: |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2056 // Constructors |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2057 Tree(unsigned long id) { SetHWND(dw_tree_new(id)); SetupObjectView(); SetupTree(); } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2058 Tree() { SetHWND(dw_tree_new(0)); SetupObjectView(); SetupTree(); } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2059 |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2060 // User functions |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2061 void Clear() { dw_tree_clear(hwnd); } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2062 HTREEITEM GetParent(HTREEITEM item) { return dw_tree_get_parent(hwnd, item); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2063 char *GetCTitle(HTREEITEM item) { return dw_tree_get_title(hwnd, item); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2064 std::string GetTitle(HTREEITEM item) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2065 char *retval = dw_tree_get_title(hwnd, item); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2066 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2067 } |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2068 HTREEITEM Insert(const char *title, HICN icon, HTREEITEM parent, void *itemdata) { return dw_tree_insert(hwnd, title, icon, parent, itemdata); } |
2929
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
2069 HTREEITEM Insert(const char *title, HICN icon, HTREEITEM parent) { return dw_tree_insert(hwnd, title, icon, parent, NULL); } |
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
2070 HTREEITEM Insert(const char *title, HICN icon) { return dw_tree_insert(hwnd, title, icon, 0, NULL); } |
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
2071 HTREEITEM InsertAfter(const char *title, HTREEITEM item, HICN icon, HTREEITEM parent, void *itemdata) { return dw_tree_insert_after(hwnd, item, title, icon, parent, itemdata); } |
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
2072 HTREEITEM InsertAfter(const char *title, HTREEITEM item, HICN icon, HTREEITEM parent) { return dw_tree_insert_after(hwnd, item, title, icon, parent, NULL); } |
2ab97b349958
C++: Add Page 3 - Tree to dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2928
diff
changeset
|
2073 HTREEITEM InsertAfter(const char *title, HTREEITEM item, HICN icon) { return dw_tree_insert_after(hwnd, item, title, icon, 0, NULL); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2074 HTREEITEM Insert(std::string title, HICN icon, HTREEITEM parent, void *itemdata) { return dw_tree_insert(hwnd, title.c_str(), icon, parent, itemdata); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2075 HTREEITEM Insert(std::string title, HICN icon, HTREEITEM parent) { return dw_tree_insert(hwnd, title.c_str(), icon, parent, NULL); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2076 HTREEITEM Insert(std::string title, HICN icon) { return dw_tree_insert(hwnd, title.c_str(), icon, 0, NULL); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2077 HTREEITEM InsertAfter(std::string title, HTREEITEM item, HICN icon, HTREEITEM parent, void *itemdata) { return dw_tree_insert_after(hwnd, item, title.c_str(), icon, parent, itemdata); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2078 HTREEITEM InsertAfter(std::string title, HTREEITEM item, HICN icon, HTREEITEM parent) { return dw_tree_insert_after(hwnd, item, title.c_str(), icon, parent, NULL); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2079 HTREEITEM InsertAfter(std::string title, HTREEITEM item, HICN icon) { return dw_tree_insert_after(hwnd, item, title.c_str(), icon, 0, NULL); } |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2080 void Change(HTREEITEM item, const char *title, HICN icon) { dw_tree_item_change(hwnd, item, title, icon); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2081 void Change(HTREEITEM item, std::string title, HICN icon) { dw_tree_item_change(hwnd, item, title.c_str(), icon); } |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2082 void Collapse(HTREEITEM item) { dw_tree_item_collapse(hwnd, item); } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2083 void Delete(HTREEITEM item) { dw_tree_item_delete(hwnd, item); } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2084 void Expand(HTREEITEM item) { dw_tree_item_expand(hwnd, item); } |
2896
d91aaffca1fc
C++: Fix missing return in DW::Tree::GetData().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2895
diff
changeset
|
2085 void *GetData(HTREEITEM item) { return dw_tree_item_get_data(hwnd, item); } |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2086 void Select(HTREEITEM item) { dw_tree_item_select(hwnd, item); } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2087 void SetData(HTREEITEM item, void *itemdata) { dw_tree_item_set_data(hwnd, item, itemdata); } |
2895
5a6bf6bd3001
C++: Divide up C++11 and Lambda support since some compilers can
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2893
diff
changeset
|
2088 #ifdef DW_LAMBDA |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2089 void ConnectTreeExpand(std::function<int(HTREEITEM)> userfunc) |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2090 { |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2091 _ConnectTreeExpand = userfunc; |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2092 if(!TreeExpandConnected) { |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2093 dw_signal_connect(hwnd, DW_SIGNAL_TREE_EXPAND, DW_SIGNAL_FUNC(_OnTreeExpand), this); |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2094 TreeExpandConnected = true; |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2095 } |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2096 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2097 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2098 void ConnectTreeExpandOld(int (*userfunc)(Tree *, HTREEITEM)) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2099 { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2100 _ConnectTreeExpandOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2101 if(!TreeExpandConnected) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2102 dw_signal_connect(hwnd, DW_SIGNAL_TREE_EXPAND, DW_SIGNAL_FUNC(_OnTreeExpand), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2103 TreeExpandConnected = true; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2104 } |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2105 } |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2106 }; |
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2107 |
2899
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2108 class SplitBar : public Widget |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2109 { |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2110 public: |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2111 // Constructors |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2112 SplitBar(int orient, Widget *topleft, Widget *bottomright, unsigned long id) { |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2113 SetHWND(dw_splitbar_new(orient, topleft ? topleft->GetHWND() : DW_NOHWND, bottomright ? bottomright->GetHWND() : DW_NOHWND, id)); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2114 SplitBar(int orient, Widget *topleft, Widget *bottomright) { |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2115 SetHWND(dw_splitbar_new(orient, topleft ? topleft->GetHWND() : DW_NOHWND, bottomright ? bottomright->GetHWND() : DW_NOHWND, 0)); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2116 |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2117 // User functions |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2118 float Get() { return dw_splitbar_get(hwnd); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2119 void Set(float percent) { dw_splitbar_set(hwnd, percent); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2120 }; |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2121 |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2122 class Dialog : public Handle |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2123 { |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2124 private: |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2125 DWDialog *dialog; |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2126 public: |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2127 // Constructors |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2128 Dialog(void *data) { dialog = dw_dialog_new(data); SetHandle(reinterpret_cast<void *>(dialog)); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2129 Dialog() { dialog = dw_dialog_new(DW_NULL); SetHandle(reinterpret_cast<void *>(dialog)); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2130 |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2131 // User functions |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2132 void *Wait() { void *retval = dw_dialog_wait(dialog); delete this; return retval; } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2133 int Dismiss(void *data) { return dw_dialog_dismiss(dialog, data); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2134 int Dismiss() { return dw_dialog_dismiss(dialog, NULL); } |
425dc0126818
C++: Implement SplitBar and Dialog classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2898
diff
changeset
|
2135 }; |
2893
5ae86b395927
C++: Implement the Tree widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2892
diff
changeset
|
2136 |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2137 class Mutex : public Handle |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2138 { |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2139 private: |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2140 HMTX mutex; |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2141 public: |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2142 // Constructors |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2143 Mutex() { mutex = dw_mutex_new(); SetHandle(reinterpret_cast<void *>(mutex)); } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2144 // Destructor |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2145 ~Mutex() { dw_mutex_close(mutex); mutex = 0; } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2146 |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2147 // User functions |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2148 void Close() { dw_mutex_close(mutex); mutex = 0; delete this; } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2149 void Lock() { dw_mutex_lock(mutex); } |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2150 int TryLock() { return dw_mutex_trylock(mutex); } |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2151 void Unlock() { dw_mutex_unlock(mutex); } |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2152 }; |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2153 |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2154 class Event : public Handle |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2155 { |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2156 private: |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2157 HEV event, named; |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2158 public: |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2159 // Constructors |
2913
6981feb6210b
C++/OS2: HEV is not a pointer type on OS/2, use 0 instead.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2912
diff
changeset
|
2160 Event() { event = dw_event_new(); named = 0; SetHandle(reinterpret_cast<void *>(event)); } |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2161 Event(const char *name) { |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2162 // Try to attach to an existing event |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2163 named = dw_named_event_get(name); |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2164 if(!named) { |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2165 // Otherwise try to create a new one |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2166 named = dw_named_event_new(name); |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2167 } |
2913
6981feb6210b
C++/OS2: HEV is not a pointer type on OS/2, use 0 instead.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2912
diff
changeset
|
2168 event = 0; |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2169 SetHandle(reinterpret_cast<void *>(named)); |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2170 } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2171 Event(std::string name) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2172 // Try to attach to an existing event |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2173 named = dw_named_event_get(name.c_str()); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2174 if(!named) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2175 // Otherwise try to create a new one |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2176 named = dw_named_event_new(name.c_str()); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2177 } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2178 event = 0; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2179 SetHandle(reinterpret_cast<void *>(named)); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2180 } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2181 // Destructor |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2182 virtual ~Event() { if(event) { dw_event_close(&event); } if(named) { dw_named_event_close(named); } } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2183 |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2184 // User functions |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2185 int Close() { |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2186 int retval = DW_ERROR_UNKNOWN; |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2187 |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2188 if(event) { |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2189 retval = dw_event_close(&event); |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2190 } else if(named) { |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2191 retval = dw_named_event_close(named); |
2913
6981feb6210b
C++/OS2: HEV is not a pointer type on OS/2, use 0 instead.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2912
diff
changeset
|
2192 named = 0; |
2908
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2193 } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2194 delete this; |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2195 return retval; |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2196 } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2197 int Post() { return (named ? dw_named_event_post(named) : dw_event_post(event)); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2198 int Reset() { return (named ? dw_named_event_reset(named) : dw_event_reset(event)); } |
1567f787b965
C++: Add Notebook class and add named event support to the Event class.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2907
diff
changeset
|
2199 int Wait(unsigned long timeout) { return (named ? dw_named_event_wait(named, timeout) : dw_event_wait(event, timeout)); } |
2900
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2200 }; |
fe31d4535270
C++: Implement Event and Mutex classes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2899
diff
changeset
|
2201 |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2202 class Timer : public Handle |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2203 { |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2204 private: |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2205 HTIMER timer; |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2206 #ifdef DW_LAMBDA |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2207 std::function<int()> _ConnectTimer; |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2208 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2209 int (*_ConnectTimerOld)(Timer *); |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2210 static int _OnTimer(void *data) { |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2211 Timer *classptr = reinterpret_cast<Timer *>(data); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2212 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2213 if(classptr->_ConnectTimer) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2214 return classptr->_ConnectTimer(); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2215 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2216 if(classptr->_ConnectTimerOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2217 return classptr->_ConnectTimerOld(classptr); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2218 return classptr->OnTimer(); |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2219 } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2220 public: |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2221 // Constructors |
2924
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2222 Timer(int interval) { |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2223 #ifdef DW_LAMBDA |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2224 _ConnectTimer = 0; |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2225 #endif |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2226 _ConnectTimerOld = 0; |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2227 timer = dw_timer_connect(interval, DW_SIGNAL_FUNC(_OnTimer), this); |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2228 SetHandle(reinterpret_cast<void *>(timer)); |
248e32f744f0
C++: Attempt to get dwtestoo working with old pre-lambda compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2923
diff
changeset
|
2229 } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2230 #ifdef DW_LAMBDA |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2231 Timer(int interval, std::function<int()> userfunc) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2232 _ConnectTimer = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2233 _ConnectTimerOld = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2234 timer = dw_timer_connect(interval, DW_SIGNAL_FUNC(_OnTimer), this); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2235 SetHandle(reinterpret_cast<void *>(timer)); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2236 } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2237 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2238 Timer(int interval, int (*userfunc)(Timer *)) { |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2239 _ConnectTimerOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2240 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2241 _ConnectTimer = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2242 #endif |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2243 timer = dw_timer_connect(interval, DW_SIGNAL_FUNC(_OnTimer), this); |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2244 SetHandle(reinterpret_cast<void *>(timer)); |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2245 } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2246 // Destructor |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2247 virtual ~Timer() { if(timer) { dw_timer_disconnect(timer); timer = 0; } } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2248 |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2249 // User functions |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2250 HTIMER GetHTIMER() { return timer; } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2251 void Disconnect() { if(timer) { dw_timer_disconnect(timer); timer = 0; } delete this; } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2252 protected: |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2253 // Our signal handler functions to be overriden... |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2254 // If they are not overridden and an event is generated, remove the unused handler |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2255 virtual int OnTimer() { |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2256 if(timer) |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2257 dw_timer_disconnect(timer); |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2258 delete this; |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2259 return FALSE; |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2260 } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2261 }; |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2262 |
2916
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2263 class Notification final : public Clickable |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2264 { |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2265 public: |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2266 // Constructors |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2267 Notification(const char *title, const char *imagepath, const char *description) { SetHWND(dw_notification_new(title, imagepath, description)); } |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2268 Notification(const char *title, const char *imagepath) { SetHWND(dw_notification_new(title, imagepath, NULL)); } |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2269 Notification(const char *title) { SetHWND(dw_notification_new(title, NULL, NULL)); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2270 Notification(std::string title, std::string imagepath, std::string description) { SetHWND(dw_notification_new(title.c_str(), imagepath.c_str(), description.c_str())); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2271 Notification(std::string title, std::string imagepath) { SetHWND(dw_notification_new(title.c_str(), imagepath.c_str(), NULL)); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2272 Notification(std::string title) { SetHWND(dw_notification_new(title.c_str(), NULL, NULL)); } |
2916
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2273 |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2274 // User functions |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2275 int Send() { int retval = dw_notification_send(hwnd); delete this; return retval; } |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2276 }; |
fe43f8667d3d
C++: Implement Notification class, and enable dwtestoo code that relied on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2914
diff
changeset
|
2277 |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2278 class Print : public Handle |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2279 { |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2280 private: |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2281 HPRINT print; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2282 #ifdef DW_LAMBDA |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2283 std::function<int(Pixmap *, int)> _ConnectDrawPage; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2284 #endif |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2285 int (*_ConnectDrawPageOld)(Print *, Pixmap *, int); |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2286 static int _OnDrawPage(HPRINT print, HPIXMAP hpm, int page_num, void *data) { |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2287 int retval; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2288 Pixmap *pixmap = new Pixmap(hpm); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2289 Print *classptr = reinterpret_cast<Print *>(data); |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2290 |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2291 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2292 if(classptr->_ConnectDrawPage) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2293 retval = classptr->_ConnectDrawPage(pixmap, page_num); |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2294 else |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2295 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2296 if(classptr->_ConnectDrawPageOld) |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2297 retval = classptr->_ConnectDrawPageOld(classptr, pixmap, page_num); |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2298 else |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2299 retval = classptr->OnDrawPage(pixmap, page_num); |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2300 |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2301 delete pixmap; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2302 return retval; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2303 } |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2304 public: |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2305 // Constructors |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2306 #ifdef DW_LAMBDA |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2307 Print(const char *jobname, unsigned long flags, unsigned int pages, std::function<int(Pixmap *, int)> userfunc) { |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2308 print = dw_print_new(jobname, flags, pages, DW_SIGNAL_FUNC(_OnDrawPage), this); |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2309 SetHandle(reinterpret_cast<void *>(print)); |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2310 _ConnectDrawPage = userfunc; |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2311 _ConnectDrawPageOld = 0; |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2312 } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2313 Print(std::string jobname, unsigned long flags, unsigned int pages, std::function<int(Pixmap *, int)> userfunc) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2314 print = dw_print_new(jobname.c_str(), flags, pages, DW_SIGNAL_FUNC(_OnDrawPage), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2315 SetHandle(reinterpret_cast<void *>(print)); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2316 _ConnectDrawPage = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2317 _ConnectDrawPageOld = 0; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2318 } |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2319 #endif |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2320 Print(const char *jobname, unsigned long flags, unsigned int pages, int (*userfunc)(Print *, Pixmap *, int)) { |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2321 print = dw_print_new(jobname, flags, pages, DW_SIGNAL_FUNC(_OnDrawPage), this); |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2322 SetHandle(reinterpret_cast<void *>(print)); |
2923
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2323 _ConnectDrawPageOld = userfunc; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2324 #ifdef DW_LAMBDA |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2325 _ConnectDrawPage = 0; |
969cc3b8bec2
C++: Include the old style function support even when lambdas are available.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2922
diff
changeset
|
2326 #endif |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2327 } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2328 Print(std::string jobname, unsigned long flags, unsigned int pages, int (*userfunc)(Print *, Pixmap *, int)) { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2329 print = dw_print_new(jobname.c_str(), flags, pages, DW_SIGNAL_FUNC(_OnDrawPage), this); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2330 SetHandle(reinterpret_cast<void *>(print)); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2331 _ConnectDrawPageOld = userfunc; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2332 #ifdef DW_LAMBDA |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2333 _ConnectDrawPage = 0; |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2334 #endif |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2335 } |
2921
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2336 // Destructor |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2337 virtual ~Print() { if(print) dw_print_cancel(print); print = 0; } |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2338 |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2339 // User functions |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2340 void Cancel() { dw_print_cancel(print); delete this; } |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2341 int Run(unsigned long flags) { int retval = dw_print_run(print, flags); delete this; return retval; } |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2342 HPRINT GetHPRINT() { return print; } |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2343 protected: |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2344 // Our signal handler functions to be overriden... |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2345 // If they are not overridden and an event is generated, remove the unused handler |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2346 virtual int OnDrawPage(Pixmap *pixmap, int page_num) { |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2347 if(print) |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2348 dw_print_cancel(print); |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2349 delete this; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2350 return FALSE; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2351 } |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2352 }; |
235fef840df2
C++: Implement Print class and enable the print code in dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2920
diff
changeset
|
2353 |
2933
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2354 class Thread : public Handle |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2355 { |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2356 private: |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2357 DWTID tid; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2358 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2359 std::function<void(Thread *)> _ConnectThread; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2360 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2361 void (*_ConnectThreadOld)(Thread *); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2362 static void _OnThread(void *data) { |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2363 Thread *classptr = reinterpret_cast<Thread *>(data); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2364 |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2365 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2366 if(classptr->_ConnectThread) |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2367 classptr->_ConnectThread(classptr); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2368 else |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2369 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2370 if(classptr->_ConnectThreadOld) |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2371 classptr->_ConnectThreadOld(classptr); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2372 else |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2373 classptr->OnThread(classptr); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2374 |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2375 delete classptr; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2376 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2377 public: |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2378 // Constructors |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2379 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2380 Thread(std::function<void(Thread *)> userfunc) { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2381 tid = dw_thread_new(DW_SIGNAL_FUNC(_OnThread), this, _DW_THREAD_STACK); |
2933
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2382 SetHandle(reinterpret_cast<void *>(tid)); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2383 _ConnectThread = userfunc; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2384 _ConnectThreadOld = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2385 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2386 Thread(std::function<void(Thread *)> userfunc, int stack) { |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2387 tid = dw_thread_new(DW_SIGNAL_FUNC(_OnThread), this, stack); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2388 SetHandle(reinterpret_cast<void *>(tid)); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2389 _ConnectThread = userfunc; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2390 _ConnectThreadOld = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2391 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2392 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2393 Thread(void (*userfunc)(Thread *)) { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2394 tid = dw_thread_new(DW_SIGNAL_FUNC(_OnThread), this, _DW_THREAD_STACK); |
2933
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2395 SetHandle(reinterpret_cast<void *>(tid)); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2396 _ConnectThreadOld = userfunc; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2397 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2398 _ConnectThread = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2399 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2400 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2401 Thread(void (*userfunc)(Thread *), int stack) { |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2402 tid = dw_thread_new(DW_SIGNAL_FUNC(_OnThread), this, stack); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2403 SetHandle(reinterpret_cast<void *>(tid)); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2404 _ConnectThreadOld = userfunc; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2405 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2406 _ConnectThread = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2407 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2408 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2409 Thread(int stack) { |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2410 tid = dw_thread_new(DW_SIGNAL_FUNC(_OnThread), this, stack); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2411 SetHandle(reinterpret_cast<void *>(tid)); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2412 _ConnectThreadOld = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2413 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2414 _ConnectThread = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2415 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2416 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2417 Thread() { |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2418 tid = dw_thread_new(DW_SIGNAL_FUNC(_OnThread), this, _DW_THREAD_STACK); |
2933
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2419 SetHandle(reinterpret_cast<void *>(tid)); |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2420 _ConnectThreadOld = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2421 #ifdef DW_LAMBDA |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2422 _ConnectThread = 0; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2423 #endif |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2424 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2425 // Destructor |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2426 virtual ~Thread() { if(tid != 0 && dw_thread_id() == tid) dw_thread_end(); tid = 0; } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2427 |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2428 // User functions |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2429 void End() { if(tid != 0 && dw_thread_id() == tid) delete this; } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2430 DWTID GetTID() { return tid; } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2431 protected: |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2432 // Our signal handler functions to be overriden... |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2433 // If they are not overridden and an event is generated, remove the unused handler |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2434 virtual void OnThread(Thread *classptr) { |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2435 delete this; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2436 } |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2437 }; |
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2438 |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2439 class App |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2440 { |
2866
6ea67d0809eb
Convert DW::App class into a singleton so subsequent DW::App::Init() calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2865
diff
changeset
|
2441 protected: |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2442 App() { } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2443 static App *_app; |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2444 public: |
2870
7b4e30c19757
C++: Disable singleton safety code for non C++11 compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2869
diff
changeset
|
2445 // Allow the code to compile if handicapped on older compilers |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
2446 #ifdef DW_CPP11 |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2447 // Singletons should not be cloneable. |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2448 App(App &other) = delete; |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2449 // Singletons should not be assignable. |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2450 void operator=(const App &) = delete; |
2870
7b4e30c19757
C++: Disable singleton safety code for non C++11 compilers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2869
diff
changeset
|
2451 #endif |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2452 // Initialization functions for creating App |
2872
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
2453 static App *Init() { if(!_app) { _app = new App; dw_init(TRUE, 0, DW_NULL); } return _app; } |
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
2454 static App *Init(const char *appid) { if(!_app) { _app = new App(); dw_app_id_set(appid, DW_NULL); dw_init(TRUE, 0, DW_NULL); } return _app; } |
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
2455 static App *Init(const char *appid, const char *appname) { if(!_app) { _app = new App(); dw_app_id_set(appid, appname); dw_init(TRUE, 0, DW_NULL); } return _app; } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2456 static App *Init(int argc, char *argv[]) { if(!_app) { _app = new App(); dw_init(TRUE, argc, argv); } return _app; } |
2872
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
2457 static App *Init(int argc, char *argv[], const char *appid) { if(!_app) { _app = new App(); dw_app_id_set(appid, DW_NULL); dw_init(TRUE, argc, argv); } return _app; } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2458 static App *Init(int argc, char *argv[], const char *appid, const char *appname) { if(!_app) { _app = new App(); dw_app_id_set(appid, appname); dw_init(TRUE, argc, argv); } return _app; } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2459 static App *Init(std::string appid) { if(!_app) { _app = new App(); dw_app_id_set(appid.c_str(), DW_NULL); dw_init(TRUE, 0, DW_NULL); } return _app; } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2460 static App *Init(std::string appid, std::string appname) { if(!_app) { _app = new App(); dw_app_id_set(appid.c_str(), appname.c_str()); dw_init(TRUE, 0, DW_NULL); } return _app; } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2461 static App *Init(int argc, char *argv[], std::string appid) { if(!_app) { _app = new App(); dw_app_id_set(appid.c_str(), DW_NULL); dw_init(TRUE, argc, argv); } return _app; } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2462 static App *Init(int argc, char *argv[], std::string appid, std::string appname) { if(!_app) { _app = new App(); dw_app_id_set(appid.c_str(), appname.c_str()); dw_init(TRUE, argc, argv); } return _app; } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2463 // Destrouctor |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2464 ~App() { dw_exit(0); } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2465 |
2882
99311a9091af
C++: Add lambda support via Connect functions on C++11, on older compilers
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2880
diff
changeset
|
2466 // User functions |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2467 void Main() { dw_main(); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2468 void MainIteration() { dw_main_iteration(); } |
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2469 void MainQuit() { dw_main_quit(); } |
2933
3cdb02171b01
C++: Implement Thread class and add the last page Thread/Event.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2932
diff
changeset
|
2470 void MainSleep(int milliseconds) { dw_main_sleep(milliseconds); } |
2869
c873b6f862b9
C++: Add text widget and packing to the window.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2868
diff
changeset
|
2471 void Exit(int exitcode) { dw_exit(exitcode); } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2472 void Shutdown() { dw_shutdown(); } |
2901
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2473 int MessageBox(const char *title, int flags, const char *format, ...) { |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2474 int retval; |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2475 va_list args; |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2476 |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2477 va_start(args, format); |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2478 retval = dw_vmessagebox(title, flags, format, args); |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2479 va_end(args); |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2480 |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2481 return retval; |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2482 } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2483 int MessageBox(std::string title, int flags, std::string format, ...) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2484 int retval; |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2485 const char *cformat = format.c_str(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2486 va_list args; |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2487 |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2488 va_start(args, format); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2489 retval = dw_vmessagebox(title.c_str(), flags, cformat, args); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2490 va_end(args); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2491 |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2492 return retval; |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2493 } |
2901
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2494 void Debug(const char *format, ...) { |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2495 va_list args; |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2496 |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2497 va_start(args, format); |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2498 dw_vdebug(format, args); |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2499 va_end(args); |
761b7a12b079
Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2900
diff
changeset
|
2500 } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2501 void Debug(std::string format, ...) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2502 const char *cformat = format.c_str(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2503 va_list args; |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2504 |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2505 va_start(args, format); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2506 dw_vdebug(cformat, args); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2507 va_end(args); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2508 } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2509 void Beep(int freq, int dur) { dw_beep(freq, dur); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2510 char *GetCDir() { return dw_app_dir(); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2511 std::string GetDir() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2512 char *retval = dw_app_dir(); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2513 return std::string(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2514 } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2515 void GetEnvironment(DWEnv *env) { dw_environment_query(env); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2516 int GetScreenWidth() { return dw_screen_width(); } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2517 int GetScreenHeight() { return dw_screen_height(); } |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
2518 void GetPointerPos(long *x, long *y) { dw_pointer_query_pos(x, y); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2519 unsigned long GetColorDepth() { return dw_color_depth_get(); } |
2960
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2520 char *GetCClipboard() { return dw_clipboard_get_text(); } |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2521 std::string GetClipboard() { |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2522 char *retval = dw_clipboard_get_text(); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2523 _dw_string_free_return(retval); |
1dabe9c6c67b
C++: Step 2 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2959
diff
changeset
|
2524 } |
2912
08fcbd5fa069
C++: Fix a warning and implement a few features in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2911
diff
changeset
|
2525 void SetClipboard(const char *text) { if(text) dw_clipboard_set_text(text, (int)strlen(text)); } |
08fcbd5fa069
C++: Fix a warning and implement a few features in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2911
diff
changeset
|
2526 void SetClipboard(const char *text, int len) { if(text) dw_clipboard_set_text(text, len); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2527 void SetClipboard(std::string text) { dw_clipboard_set_text(text.c_str(), (int)strlen(text.c_str())); } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2528 void SetClipboard(std::string text, int len) { dw_clipboard_set_text(text.c_str(), len); } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2529 void SetDefaultFont(const char *fontname) { dw_font_set_default(fontname); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2530 void SetDefaultFont(std::string fontname) { dw_font_set_default(fontname.c_str()); } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2531 unsigned long ColorChoose(unsigned long initial) { return dw_color_choose(initial); } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2532 char *FileBrowse(const char *title, const char *defpath, const char *ext, int flags) { return dw_file_browse(title, defpath, ext, flags); } |
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2533 char *FontChoose(const char *currfont) { return dw_font_choose(currfont); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2534 std::string FileBrowse(std::string title, std::string defpath, std::string ext, int flags) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2535 char *retval = dw_file_browse(title.c_str(), defpath.c_str(), ext.c_str(), flags); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2536 return retval ? std::string(retval) : std::string(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2537 } |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2538 std::string FontChoose(std::string currfont) { |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2539 char *retval = dw_font_choose(currfont.c_str()); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2540 return retval ? std::string(retval) : std::string(); |
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2541 } |
2905
0f5008c05134
C++: Implement Timer class, a bunch of destructors and functions in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2903
diff
changeset
|
2542 void Free(void *buff) { dw_free(buff); } |
2912
08fcbd5fa069
C++: Fix a warning and implement a few features in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2911
diff
changeset
|
2543 int GetFeature(DWFEATURE feature) { return dw_feature_get(feature); } |
08fcbd5fa069
C++: Fix a warning and implement a few features in App.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2911
diff
changeset
|
2544 int SetFeature(DWFEATURE feature, int state) { return dw_feature_set(feature, state); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2545 HICN LoadIcon(unsigned long id) { return dw_icon_load(0, id); } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2546 HICN LoadIcon(const char *filename) { return dw_icon_load_from_file(filename); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2547 HICN LoadIcon(std::string filename) { return dw_icon_load_from_file(filename.c_str()); } |
2914
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2548 HICN LoadIcon(const char *data, int len) { return dw_icon_load_from_data(data, len); } |
8af64b6d75a9
C++: Start rewriting dwtest in C++ as dwtestoo.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2913
diff
changeset
|
2549 void FreeIcon(HICN icon) { dw_icon_free(icon); } |
2919
e609aa6a5b93
C++: Attempt to implement page 2 rendering...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2917
diff
changeset
|
2550 void TaskBarInsert(Widget *handle, HICN icon, const char *bubbletext) { dw_taskbar_insert(handle ? handle->GetHWND() : DW_NOHWND, icon, bubbletext); } |
2959
cde59690d3dd
C++: Step 1 of the std::string transition.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2950
diff
changeset
|
2551 void TaskBarInsert(Widget *handle, HICN icon, std::string bubbletext) { dw_taskbar_insert(handle ? handle->GetHWND() : DW_NOHWND, icon, bubbletext.c_str()); } |
2917
77e5d6743013
C++: Implement most of Page 2 (Render) except the actual rendering.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2916
diff
changeset
|
2552 void TaskBarDelete(Widget *handle, HICN icon) { dw_taskbar_delete(handle ? handle->GetHWND() : DW_NOHWND, icon); } |
2938
1184f58135ba
C++: Eliminate remnants of C code I missed while porting to C++.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2937
diff
changeset
|
2553 char * WideToUTF8(const wchar_t * wstring) { return dw_wchar_to_utf8(wstring); } |
1184f58135ba
C++: Eliminate remnants of C code I missed while porting to C++.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2937
diff
changeset
|
2554 wchar_t *UTF8ToWide(const char * utf8string) { return dw_utf8_to_wchar(utf8string); } |
2861
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2555 }; |
ef7a414f9b71
Add initial C++ binding header and example program.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff
changeset
|
2556 |
2866
6ea67d0809eb
Convert DW::App class into a singleton so subsequent DW::App::Init() calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2865
diff
changeset
|
2557 // Static singleton reference declared outside of the class |
2872
e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2871
diff
changeset
|
2558 App* App::_app = DW_NULL; |
2866
6ea67d0809eb
Convert DW::App class into a singleton so subsequent DW::App::Init() calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2865
diff
changeset
|
2559 |
2940
60e90b783cb1
C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2939
diff
changeset
|
2560 } // namespace DW |
2936
75f6e21f5a02
C++: Connected the wrong signal for the HTML result, causing crashes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
2933
diff
changeset
|
2561 #endif |