Permalink
Browse files

New Windows32 compatible branch.

Regenerate to support os-dependent module.
Built against Gtk 2.24 and Glib 2.28
  • Loading branch information...
1 parent 5562417 commit 49d06ee5e309db4fdf8d747c9ec7593fee3f0f47 @jtappin jtappin committed Feb 20, 2013
View
@@ -48,7 +48,7 @@ module handlers
& gtk_about_dialog_set_website, gtk_button_new, gtk_button_new_with_label, &
& gtk_container_add, gtk_container_set_border_width, gtk_dialog_run, gtk_drawing_area_new,&
& gtk_entry_get_text, gtk_entry_new, gtk_file_chooser_button_new, &
- & gtk_file_chooser_get_file, gtk_file_chooser_get_filename, gtk_label_new, gtk_main, &
+ & gtk_file_chooser_get_file, gtk_label_new, gtk_main, &
& gtk_main_quit, gtk_progress_bar_new, gtk_progress_bar_pulse, &
& gtk_progress_bar_set_fraction, gtk_progress_bar_set_text, gtk_scrolled_window_new,&
& gtk_table_attach, gtk_table_attach_defaults, gtk_table_new, gtk_text_buffer_set_text,&
@@ -63,6 +63,8 @@ module handlers
use gdk, only: gdk_cairo_create, gdk_cairo_set_source_pixbuf
use gdk_pixbuf, only: gdk_pixbuf_get_has_alpha, gdk_pixbuf_get_n_channels, &
& gdk_pixbuf_get_pixels, gdk_pixbuf_get_rowstride, gdk_pixbuf_new
+
+ use gtk_os_dependent, only: gtk_file_chooser_get_filename
use my_widgets
implicit none
@@ -31,9 +31,9 @@ module handlers
use gtk, only: gtk_button_new, gtk_container_add, gtk_main, gtk_main_quit, gtk_&
&text_view_new, gtk_widget_set_sensitive, gtk_widget_show, gtk_widget_show_all,&
- & gtk_window_new, gtk_init, gtk_file_chooser_get_filename, TRUE, FALSE
+ & gtk_window_new, gtk_init, TRUE, FALSE
- use g, only: alloca
+ use gtk_os_dependent, only: gtk_file_chooser_get_filename
implicit none
View
@@ -29,11 +29,12 @@
module handlers
use gtk, only: gtk_action_group_add_action, gtk_action_group_get_action, gtk_ac&
&tion_group_new, gtk_action_new, gtk_box_pack_start, gtk_container_add, gtk_mai&
- &n, gtk_main_quit, gtk_ui_manager_add_ui, gtk_ui_manager_add_ui_from_file, gtk_&
+ &n, gtk_main_quit, gtk_ui_manager_add_ui, gtk_&
&ui_manager_add_ui_from_string, gtk_ui_manager_get_widget, gtk_ui_manager_inser&
&t_action_group, gtk_ui_manager_new, gtk_vbox_new, gtk_widget_set_size_request,&
& gtk_widget_show, gtk_widget_show_all, gtk_window_new, gtk_window_set_title,&
&gtk_init, g_signal_connect, FALSE, TRUE, c_null_ptr, c_null_char, GTK_WINDOW_TOPLEVEL
+ use gtk_os_dependent, only: gtk_ui_manager_add_ui_from_file
implicit none
contains
View
@@ -51,9 +51,18 @@ set(sources
"gtk-sup.f90"
"gdk-pixbuf-hl.f90"
"pango-auto.f90"
- "gdk-pixbuf-hl.f90"
"gdkevents-auto2.f90")
+if (CMAKE_HOST_WIN32)
+ set(sources
+ ${sources}
+ "mswindowsonly-auto.f90")
+else()
+ set(sources
+ ${sources}
+ "unixonly-auto.f90")
+endif()
+
include_directories("/usr/include")
include_directories(${GTK_INCLUDES})
include_directories("/usr/local/include")
@@ -151,9 +160,9 @@ install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/gtk_draw_hl.mod"
"${CMAKE_CURRENT_BINARY_DIR}/gdk_pixbuf_hl.mod"
"${CMAKE_CURRENT_BINARY_DIR}/gtk_sup.mod"
- "${CMAKE_CURRENT_BINARY_DIR}/gdk_pixbuf_hl.mod"
"${CMAKE_CURRENT_BINARY_DIR}/pango.mod"
"${CMAKE_CURRENT_BINARY_DIR}/gdk_events.mod"
+ "${CMAKE_CURRENT_BINARY_DIR}/gtk_os_dependent.mod"
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gtk-2-fortran)
install(PROGRAMS
Oops, something went wrong.

0 comments on commit 49d06ee

Please sign in to comment.