Mercurial > cropper
changeset 16:88b8856fccf5
merged callbacks.h in main.h
| author | meillo@marmaro.de |
|---|---|
| date | Thu, 04 Mar 2010 19:20:41 +0100 |
| parents | 7dbf3879939a |
| children | 4453456abad1 |
| files | Makefile callbacks.c callbacks.h interface.c main.h |
| diffstat | 5 files changed, 10 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Mar 04 19:16:10 2010 +0100 +++ b/Makefile Thu Mar 04 19:20:41 2010 +0100 @@ -3,7 +3,7 @@ NAME = cropper SRC = interface.c callbacks.c main.c -DEP = main.h callbacks.h +DEP = main.h OBJ = ${SRC:.c=.o} CC = gcc @@ -21,8 +21,8 @@ ${CC} ${CFLAGS} -c $< -interface.o: main.h callbacks.h -callbacks.o: main.h callbacks.h +interface.o: main.h +callbacks.o: main.h main.o: main.h
--- a/callbacks.c Thu Mar 04 19:16:10 2010 +0100 +++ b/callbacks.c Thu Mar 04 19:20:41 2010 +0100 @@ -2,7 +2,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk/gdkkeysyms.h> #include "main.h" -#include "callbacks.h" int image_width; int image_height;
--- a/callbacks.h Thu Mar 04 19:16:10 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -#ifndef _CALLBACKS_H_ -#define _CALLBACKS_H_ - -#include <gtk/gtk.h> - -double ratio; - -void crop(void); -gboolean on_key_press(GtkWidget* window, GdkEventKey* pKey, gpointer userdata); -void on_cropper_window_create(GtkObject* object, gpointer user_data); -void on_cropper_window_destroy(GtkObject* object, gpointer user_data); - - - -/* -gboolean on_cropper_window_delete_event(GtkWidget* widget, GdkEvent *event, gpointer user_data); - -void on_zoom_in_button_clicked(GtkObject* object, gpointer user_data); -void on_zoom_out_button_clicked(GtkObject* object, gpointer user_data); -void on_zoom_100_button_clicked(GtkObject* object, gpointer user_data); -void on_zoom_fit_button_clicked(GtkObject* object, gpointer user_data); - -void on_ratio_none_activate(GtkMenuItem* menuitem, gpointer user_data); -void on_ratio_square_activate(GtkMenuItem* menuitem, gpointer user_data); -void on_ratio_4x3_activate(GtkMenuItem* menuitem, gpointer user_data); -void on_ratio_3x2_activate(GtkMenuItem* menuitem, gpointer user_data); -void on_ratio_custom_activate(GtkMenuItem* menuitem, gpointer user_data); - -static void ratio_optionmenu_changed_cb(GtkOptionMenu* optionmenu, gpointer unser_data); -static void ratio_value_changed_cb(GtkSpinButton* spin, gpointer unser_data); -static void ratio_swap_button_cb(GtkButton* button, gpointer unser_data); - -void on_ratio_w_spinbutton_value_changed(GtkSpinButton* spinbutton, gpointer user_data); -void on_ratio_w_spinbutton_change_value(GtkSpinButton* spinbutton, GtkScrollType scroll, gpointer user_data); -void on_ratio_h_spinbutton_change_value(GtkSpinButton* spinbutton, GtkScrollType scroll, gpointer user_data); -void on_ratio_h_spinbutton_value_changed(GtkSpinButton* spinbutton, gpointer user_data); -void on_ratio_swap_button_clicked(GtkButton* button, gpointer user_data); -*/ - - -#endif
--- a/interface.c Thu Mar 04 19:16:10 2010 +0100 +++ b/interface.c Thu Mar 04 19:20:41 2010 +0100 @@ -9,7 +9,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include "main.h" -#include "callbacks.h" #define GLADE_HOOKUP_OBJECT(component,widget,name) \ g_object_set_data_full(G_OBJECT(component), name, \
--- a/main.h Thu Mar 04 19:16:10 2010 +0100 +++ b/main.h Thu Mar 04 19:20:41 2010 +0100 @@ -1,6 +1,3 @@ -#ifndef _MAIN_H_ -#define _MAIN_H_ - #include <gtk/gtk.h> GtkWidget* cropper_window; @@ -13,4 +10,10 @@ int w, h, x, y; -#endif +/* from callbacks.h */ +double ratio; + +void crop(void); +gboolean on_key_press(GtkWidget* window, GdkEventKey* pKey, gpointer userdata); +void on_cropper_window_create(GtkObject* object, gpointer user_data); +void on_cropper_window_destroy(GtkObject* object, gpointer user_data);