github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-17 22:03:03 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

Browse source
This commit is contained in:
Mirek Fidler 2025-01-04 08:52:09 +01:00
commit 9c3dc99cc3
8 changed files with 70 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -1,14 +1,15 @@
UPPDIR1 = ./uppsrc/
UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/
UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/
UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/
UPPOUT = .cache/upp.out/
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT)
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT)
Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX
CXX = c++
LINKER = $(CXX)
CFLAGS = -O3 -ffunction-sections -fdata-sections
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14
LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS)
LIBPATH =
AR = ar -sr

9
Makefile.in
View file

@ -1,14 +1,15 @@
UPPDIR1 = ./uppsrc/
UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/
UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/
UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/
UPPOUT = .cache/upp.out/
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT)
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` `pkg-config --cflags xinerama` `pkg-config --cflags xrender` `pkg-config --cflags xft` `pkg-config --cflags xdmcp` `pkg-config --cflags xext` `pkg-config --cflags gtk+-3.0` `pkg-config --cflags libnotify` -I./ -I$(UPPOUT)
Macro = -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX
CXX = c++
LINKER = $(CXX)
CFLAGS = -O3 -ffunction-sections -fdata-sections
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14
LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS)
LIBPATH =
AR = ar -sr

9
umkMakefile
View file

@ -1,14 +1,15 @@
UPPDIR1 = ./uppsrc/
UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/
UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/
UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/
UPPOUT = .cache/upp.out/
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT)
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT)
Macro = -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX
CXX = c++
LINKER = $(CXX)
CFLAGS = -O3 -ffunction-sections -fdata-sections
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14
LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS)
LIBPATH =
AR = ar -sr

9
umkMakefile.in
View file

@ -1,14 +1,15 @@
UPPDIR1 = ./uppsrc/
UPPDIR2 = /home/cxl/.config/u++/umk/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/umk/UppHub/eigen/
UPPDIR2 = /home/cxl/.config/u++/theide/UppHub/gdal/
UPPDIR3 = /home/cxl/.config/u++/theide/UppHub/eigen/
UPPDIR4 = /home/cxl/.config/u++/theide/UppHub/Functions4U/
UPPOUT = .cache/upp.out/
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT)
CINC = -I$(UPPDIR1) -I$(UPPDIR2) -I$(UPPDIR3) -I$(UPPDIR4) `pkg-config --cflags libpng` `pkg-config --cflags freetype2` `pkg-config --cflags fontconfig` `pkg-config --cflags x11` `pkg-config --cflags xcb` `pkg-config --cflags expat` -I./ -I$(UPPOUT)
Macro = -DflagGCC -DflagSHARED -DflagPOSIX -DflagLINUX
CXX = c++
LINKER = $(CXX)
CFLAGS = -O3 -ffunction-sections -fdata-sections
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++17
CXXFLAGS = -O3 -ffunction-sections -fdata-sections -std=c++14
LDFLAGS = -Wl,--gc-sections $(LINKOPTIONS)
LIBPATH =
AR = ar -sr

10
uppsrc/CtrlCore/Win32Proc.cpp
View file

@ -680,10 +680,14 @@ LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
*/
}
if(hwnd) {
if(IsWindowUnicode(hwnd)) // TRC 04/10/17: ActiveX unicode patch
return DefWindowProcW(hwnd, message, wParam, lParam);
LRESULT r;
int level = LeaveGuiMutexAll();
if(IsWindowUnicode(hwnd))
r = DefWindowProcW(hwnd, message, wParam, lParam);
else
return DefWindowProc(hwnd, message, wParam, lParam);
r = DefWindowProc(hwnd, message, wParam, lParam);
EnterGuiMutex(level);
return r;
}
return 0L;
}

2
uppsrc/CtrlLib/LineEdit.cpp
View file

@ -249,7 +249,7 @@ void LineEdit::RectSelectionLeftRight(int dir, bool homeend)
return false;
};
int n = homeend ? 1000 : 1;
int n = homeend ? 2000 : 1;
while(n > 0 && (Try(anchor, cursor) || Try(cursor, anchor)))
n--;

9
upptst/MTGuiLockResize/MTGuiLockResize.upp Normal file
View file

@ -0,0 +1,9 @@
uses
CtrlLib;
file
main.cpp;
mainconfig
"" = "GUI";

33
upptst/MTGuiLockResize/main.cpp Normal file
View file

@ -0,0 +1,33 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
struct MyApp : TopWindow {
Label label;
MyApp() {
Sizeable().Zoomable();
Add(label.LeftPos(0, 1000).TopPos(0, 200));
label.SetFont(Arial(200));
Thread::Start([=] {
int ii = 0;
for(;;) {
Sleep(100);
GuiLock __;
if(IsShutdownThreads())
break;
label = AsString(ii++);
}
});
}
~MyApp() {
ShutdownThreads();
}
};
GUI_APP_MAIN
{
MyApp().Run();
}