2f92f644b5
Migrated util.m and the new NSTextField functions.
2018-05-04 20:26:13 -04:00
1381edfa6e
Migrated main.m functions. Before we merge this back in I absoltuely must do something about main.m and menu.m, even if ethereal.
2018-05-04 19:50:02 -04:00
60e71c7174
Migrated menu.m for now. Need to figure out what to do about ivars and methods and properties. Also still not happy with the property and autoreleasepool mess of main.m...
2018-05-03 23:20:12 -04:00
b8316c61dd
Converted struct mapTable to uiprivMap first, since that typedef will be a dependency of later stuff. ALso I didn't realize whoever wrote that new menu code also completely rewrote map.m... Cleaned up style inconsistencies I found in both. Anyway I plan on getting rid of that menu code anyway, and I could just have something else for target-action instead of this depending on whatever happens with ARC...
2018-05-03 23:02:38 -04:00
5a113e1e0b
Renamed toNSString() and fromNSString() to uiprivToNSString() and uiprivFromNSString(), respectively.
2018-05-03 22:38:21 -04:00
4fe74fbd56
Started OS X name migration by moving uipriv_darwin.h out of the way.
2018-05-03 22:28:02 -04:00
6a4a3e1b4d
More TODOs.
2018-05-03 01:55:35 -04:00
0359c2fa5c
Merge branch 'windows-resource-removal'
...
Updates #308 .
2018-05-02 23:40:04 -04:00
134acf6ec0
And now that I tested everything to see that it worked, including msbuild and MinGW-w64 builds, updated the README.md. Time to merge back with master!
2018-05-02 23:38:08 -04:00
7ee7de1b92
And removed the rc file copying stuff from CMakeLists.txt. I wonder if this fixes the msbuild generators in cmake, so let's find out...
2018-05-02 23:04:43 -04:00
4432e39a44
And the color dialog. All done! Now we just need to clean up and remove the kludge.
2018-05-02 21:13:35 -04:00
e3e88c7a6a
And migrated the font dialog.
2018-05-02 20:57:50 -04:00
3522ec02b3
Fixed out.
2018-05-02 20:24:30 -04:00
a4cb17820c
Forgot a fix (thanks to two people on Telegram)
2018-05-02 20:21:51 -04:00
b975cfb83e
Fixes and TODOs in rc2bin. Going to manually adjust out instead of regenerating it, though.
2018-05-02 20:20:06 -04:00
c6979fa738
Removed rcTabPageDIalog from the resources. Also removed CRs from the out file. Need to fix that generator...
2018-05-02 20:17:08 -04:00
e11196304f
Since out32 and out64 are identical, deduplicate them. Now we can move its contents elsewhere.
2018-05-02 10:00:44 -04:00
88882592ac
Fixed compiler errors and generated the output.
2018-05-02 09:59:29 -04:00
10de22f9ac
Added a program to dump resources to C structs.
2018-05-02 09:56:06 -04:00
17ec9562ea
Cleanup of previous merge, including TODOs and massive infodumps.
2018-04-30 21:55:54 -04:00
b9fd9fc395
Merge pull request #354 from bcampbell/new-msys-fixes
...
Fixes to compile utflib-and-attrstr changes on Windows with MinGW-w64
I did not do this myself; thanks @bcampbell for the fixes!
2018-04-30 21:45:29 -04:00
2be8fd3eb3
Fixes to compile on windows with msys2
...
msys2 seems to be unsure of it's IDWriteTypography definition and
disables it by default. This overrides the disabling (The
IDWriteTypography definition looks OK to me, and seems to work
fine).
This commit also adds in a canary to detect compilers that have a non-16bit
wchar_t on windows (eg a gcc focused on porting unix code rather
than compiling windows code).
2018-05-01 12:59:26 +12:00
55f2eba45b
Add wchar_t overloads to utf.h for C++ on Windows with non-MSVC compilers; I did not realize that was also a thing I needed to worry about!
...
Update #287
2018-04-30 07:46:38 -04:00
f88c23602e
More notes.
2018-04-22 23:47:22 -04:00
5cc85c2609
More ifxes.
2018-04-19 20:33:20 -04:00
3f421f9816
Merge pull request #340 from parro-it/fix-timer-windows-2
...
Fix uiprivTimer::f, it should return an int
2018-04-19 20:31:08 -04:00
e61f7fb0cb
Fix uiprivTimer::f: it should return an int
2018-04-19 21:03:49 +02:00
591b9c8772
And added to the README. Woo! (Also more TODOs.)
2018-04-18 21:11:23 -04:00
83b04cda47
And added documentation nits and TODOs to the uiTimer() code.
2018-04-18 21:09:24 -04:00
cac4cd9e81
Cleaned up stylistic nits and common branch naming issues on the new uiTimer() code. Also switched the Windows code to use a simple struct instead of the class (and with a uipriv name).
2018-04-18 21:04:12 -04:00
85a4c6d35d
Merge pull request #277 from cody271/timer
...
Adds a function uiTimer() that runs code on the main loop at certain intervals.
Original comment: Add Timer API
2018-04-18 20:52:59 -04:00
ab336e0e8b
Fixed uiImage redeclaration warnings on OS X.
2018-04-18 10:29:16 -04:00
bd2f436d91
Fixed uiImage redeclaration warnings on GTK+.
2018-04-18 10:20:55 -04:00
6507a0d3a1
Updated common uipriv names on Unix.
2018-04-18 10:17:41 -04:00
d441455112
Updated common uipriv names on OS X.
2018-04-18 10:06:43 -04:00
ae2eea7975
Merge branch 'master' into table
...
Long-overdue sync.
2018-04-18 10:00:13 -04:00
9cf6c3faf5
Updated the README with the previous merge.
...
Update #308 . Oops, forgot to do this with the merge...
2018-04-18 00:58:21 -04:00
3539cda280
Merge branch 'common-namespace-cleanup'
...
This begins the process of cleaning up the libui namespace.
2018-04-18 00:55:21 -04:00
52dc39a553
Decided to keep attrstr.h for now; removed extern "C" hack from attrstr.hpp on Windows and moved it into attrstr.h. Let's merge back.
2018-04-18 00:54:24 -04:00
4df47a6ee8
Decided what to do about uipriv.h including ui.h (uipriv_OS.h* wrecks that plan, so make a note of us not doing it). Now to just decide what to do about attrstr.h and then we can merge back.
2018-04-17 21:04:04 -04:00
5622b13c23
uiTimer() Use uiNew() and uiFree()
2018-04-16 17:49:08 -07:00
f921dde9f6
uiTimer() Use 'uipriv' prefix convention
2018-04-16 17:48:33 -07:00
fa7466e7b4
uiTimer() Qualify Objective-C instance variables with 'self'
2018-04-16 17:45:30 -07:00
ee986363c8
More notes.
2018-04-16 20:35:47 -04:00
d99549ec18
uiTimer() Use TimerHandler pointers directly as Windows timer IDs
2018-04-16 17:28:13 -07:00
c9d11a85cc
uiTimer() Refactor TimerHandler for Windows timer IDs
2018-04-16 17:28:13 -07:00
4e6adca08c
uiTimer() Ensure Windows timer IDs are unique
2018-04-16 17:28:13 -07:00
b1210165a0
Implement uiTimer() for Windows
2018-04-16 17:28:13 -07:00
68e1223e4d
Fix TimerDelegate memory leak
2018-04-16 17:28:13 -07:00
5dbe20593d
Implement uiTimer() for GTK+ and OS X
2018-04-16 17:28:12 -07:00
Pietro Gagliardi
Pietro Gagliardi
Ben Campbell
Andrea Parodi
cody271