X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-paint.h;h=39d2eb94bf14d0608403dbdcbfeb098256025a3d;hb=HEAD;hp=d69b88100d48d82ae934c8b25b694406a16b80ec;hpb=dcbb0ab8521a5e166f257d86884407eb98ef63f0;p=xournal.git

diff --git a/src/xo-paint.h b/src/xo-paint.h
index d69b881..39d2eb9 100644
--- a/src/xo-paint.h
+++ b/src/xo-paint.h
@@ -1,3 +1,19 @@
+/*
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This software is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of  
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 void set_cursor_busy(gboolean busy);
 void update_cursor(void);
 void update_cursor_for_resize(double *pt);
@@ -11,26 +27,13 @@ void finalize_erasure(void);
 
 void do_hand(GdkEvent *event);
 
-void start_selectrect(GdkEvent *event);
-void finalize_selectrect(void);
-gboolean start_movesel(GdkEvent *event);
-void start_vertspace(GdkEvent *event);
-void continue_movesel(GdkEvent *event);
-void finalize_movesel(void);
-gboolean start_resizesel(GdkEvent *event);
-void continue_resizesel(GdkEvent *event);
-void finalize_resizesel(void);
-
-void selection_delete(void);
-void selection_to_clip(void);
-void clipboard_paste(void);
-
-void recolor_selection(int color);
-void rethicken_selection(int val);
-
 /* text functions */
 
+#ifdef WIN32
+#define DEFAULT_FONT "Arial"
+#else
 #define DEFAULT_FONT "Sans"
+#endif
 #define DEFAULT_FONT_SIZE 12
 
 void start_text(GdkEvent *event, struct Item *item);
@@ -38,5 +41,6 @@ void end_text(void);
 void update_text_item_displayfont(struct Item *item);
 void rescale_text_items(void);
 struct Item *click_is_in_text(struct Layer *layer, double x, double y);
+struct Item *click_is_in_text_or_image(struct Layer *layer, double x, double y);
 void refont_text_item(struct Item *item, gchar *font_name, double font_size);
 void process_font_sel(gchar *str);