summaryrefslogtreecommitdiff
path: root/ldmicro
diff options
context:
space:
mode:
Diffstat (limited to 'ldmicro')
-rw-r--r--ldmicro/CMakeLists.txt2
-rw-r--r--ldmicro/includes/linuxUI/linuxLD.h4
-rw-r--r--ldmicro/linuxUI.cpp2
3 files changed, 5 insertions, 3 deletions
diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt
index 635fdff..1becba8 100644
--- a/ldmicro/CMakeLists.txt
+++ b/ldmicro/CMakeLists.txt
@@ -61,5 +61,5 @@ ENDIF ( GTK3_FOUND)
## to compile LDmicro uncomment the below 2 line2
#add_executable (LDMicro ldmicro.cpp)# miscutil.cpp draw_outputdev.cpp)
# install (TARGETS LDMicro DESTINATION bin)
-add_executable (linuxUI linuxUI.cpp)
+add_executable (linuxUI testMain.cpp)
install (TARGETS linuxUI DESTINATION bin)
diff --git a/ldmicro/includes/linuxUI/linuxLD.h b/ldmicro/includes/linuxUI/linuxLD.h
index 77352e4..53194e1 100644
--- a/ldmicro/includes/linuxUI/linuxLD.h
+++ b/ldmicro/includes/linuxUI/linuxLD.h
@@ -20,10 +20,12 @@ typedef unsigned int DWORD;
typedef void* PVOID;
typedef GtkWidget* HANDLE;
typedef HANDLE HINSTANCE;
-typedef HANDLE HWND;
+typedef HANDLE HWID;
typedef HANDLE HDC;
typedef HANDLE HMENU;
+typedef GtkWindow* HWND;
+
typedef GtkApplication* HAPP;
/// Check if system is x64 or x86
diff --git a/ldmicro/linuxUI.cpp b/ldmicro/linuxUI.cpp
index 85c605e..854ed09 100644
--- a/ldmicro/linuxUI.cpp
+++ b/ldmicro/linuxUI.cpp
@@ -3,7 +3,7 @@
/// Wraper function for gtk_window_has_toplevel_focus
BOOL isFocus(HWND window)
{
- return (BOOL) gtk_window_has_toplevel_focus(GTK_WINDOW(gtk_widget_get_parent_window(GTK_WIDGET(window))));
+ return (BOOL) gtk_window_has_toplevel_focus(GTK_WINDOW(window)));
}
COLORREF RGB(int red, int green, int blue)