Moved GTK stucts into their own package

src/dorkbox/systemTray/jna/linux/AppIndicator.java

@@ -21,6 +21,7 @@ import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
 
 import dorkbox.systemTray.SystemTray;
+import dorkbox.systemTray.jna.linux.structs.AppIndicatorInstanceStruct;
 import dorkbox.util.OS;
 import dorkbox.util.jna.JnaHelper;
 
@@ -187,7 +188,8 @@ class AppIndicator {
 //    public static final int STATUS_ATTENTION = 2;
 
 
-    public static native AppIndicatorInstanceStruct app_indicator_new(String id, String icon_name, int category);
+    public static native
+    AppIndicatorInstanceStruct app_indicator_new(String id, String icon_name, int category);
 
     public static native void app_indicator_set_title(AppIndicatorInstanceStruct self, String title);
     public static native void app_indicator_set_status(AppIndicatorInstanceStruct self, int status);

src/dorkbox/systemTray/jna/linux/GEventCallback.java

@@ -18,6 +18,7 @@ package dorkbox.systemTray.jna.linux;
 import com.sun.jna.Callback;
 import com.sun.jna.Pointer;
 
+import dorkbox.systemTray.jna.linux.structs.GdkEventButton;
 import dorkbox.util.Keep;
 
 @Keep

src/dorkbox/systemTray/jna/linux/Gtk.java

@@ -22,6 +22,7 @@ import com.sun.jna.NativeLibrary;
 import com.sun.jna.Pointer;
 
 import dorkbox.systemTray.SystemTray;
+import dorkbox.systemTray.jna.linux.structs.GtkStyle;
 import dorkbox.util.OS;
 import dorkbox.util.jna.JnaHelper;
 

src/dorkbox/systemTray/jna/linux/Gtk2.java

@@ -18,6 +18,8 @@ package dorkbox.systemTray.jna.linux;
 import com.sun.jna.Function;
 import com.sun.jna.Pointer;
 
+import dorkbox.systemTray.jna.linux.structs.GtkStyle;
+
 /**
  * Bindings for GTK+ 2. Bindings that are exclusively for GTK+ 3 are in that respective class
  *

src/dorkbox/systemTray/jna/linux/GtkTheme.java

@@ -20,6 +20,11 @@ import com.sun.jna.ptr.PointerByReference;
 
 import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.Tray;
+import dorkbox.systemTray.jna.linux.structs.GdkColor;
+import dorkbox.systemTray.jna.linux.structs.GdkRGBAColor;
+import dorkbox.systemTray.jna.linux.structs.GtkRequisition;
+import dorkbox.systemTray.jna.linux.structs.GtkStyle;
+import dorkbox.systemTray.jna.linux.structs.PangoRectangle;
 import dorkbox.systemTray.util.CssParser;
 import dorkbox.systemTray.util.CssParser.Css;
 import dorkbox.systemTray.util.CssParser.CssNode;

src/dorkbox/systemTray/jna/linux/structs/AppIndicatorInstanceStruct.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/GObjectStruct.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/GParamSpecStruct.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/GTypeInstanceStruct.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/GdkColor.java

@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.awt.Color;
 import java.util.Arrays;

src/dorkbox/systemTray/jna/linux/structs/GdkEventButton.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/GdkRGBAColor.java

@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.awt.Color;
 import java.util.Arrays;

src/dorkbox/systemTray/jna/linux/structs/GtkRequisition.java

@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/GtkStyle.java

@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/jna/linux/structs/PangoRectangle.java

@@ -1,4 +1,4 @@
-package dorkbox.systemTray.jna.linux;
+package dorkbox.systemTray.jna.linux.structs;
 
 import java.util.Arrays;
 import java.util.List;

src/dorkbox/systemTray/nativeUI/_AppIndicatorNativeTray.java

@@ -25,9 +25,9 @@ import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.Tray;
 import dorkbox.systemTray.gnomeShell.Extension;
 import dorkbox.systemTray.jna.linux.AppIndicator;
-import dorkbox.systemTray.jna.linux.AppIndicatorInstanceStruct;
 import dorkbox.systemTray.jna.linux.Gobject;
 import dorkbox.systemTray.jna.linux.GtkEventDispatch;
+import dorkbox.systemTray.jna.linux.structs.AppIndicatorInstanceStruct;
 import dorkbox.systemTray.util.ImageResizeUtil;
 
 /**

src/dorkbox/systemTray/nativeUI/_GtkStatusIconNativeTray.java

@@ -25,10 +25,10 @@ import dorkbox.systemTray.SystemTray;
 import dorkbox.systemTray.Tray;
 import dorkbox.systemTray.gnomeShell.Extension;
 import dorkbox.systemTray.jna.linux.GEventCallback;
-import dorkbox.systemTray.jna.linux.GdkEventButton;
 import dorkbox.systemTray.jna.linux.Gobject;
 import dorkbox.systemTray.jna.linux.Gtk;
 import dorkbox.systemTray.jna.linux.GtkEventDispatch;
+import dorkbox.systemTray.jna.linux.structs.GdkEventButton;
 
 /**
  * Class for handling all system tray interactions via GTK.