grim/guifications2

moved a few win32 things i missed from src/gf_display.c to src/win32/gf_win32_display.c

2011-12-04, Gary Kramlich
e7bd51c1d2f1
Parents 98e4814e9761
Children c346c44f2448
moved a few win32 things i missed from src/gf_display.c to src/win32/gf_win32_display.c
2 files changed, 11 insertions(+), 10 deletions(-)
  • +0 -10
    src/gf_display.c
  • +11 -0
    src/win32/gf_win32_display.c
    • --- a/src/gf_display.c Sun Dec 04 01:10:26 2011 -0600
    +++ b/src/gf_display.c Sun Dec 04 01:13:21 2011 -0600
    @@ -16,15 +16,6 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
    */
    -#ifdef _WIN32
    -# ifndef WINVER
    -# define WINVER 0x0500 /* This is Windows 2000 */
    -# endif /* WINVER */
    -# include <windows.h>
    -typedef HMONITOR WINAPI GF_MonitorFromRect(LPCRECT,DWORD);
    -typedef BOOL WINAPI GF_GetMonitorInfo(HMONITOR,LPMONITORINFO);
    -#endif /* _WIN32 */
    -
    #ifdef HAVE_CONFIG_H
    # include "../gf_config.h"
    #endif
    @@ -41,7 +32,6 @@
    #include <prefs.h>
    #include <version.h>
    -
    #include "gf_action.h"
    #include "gf_event_info.h"
    #include "gf_notification.h"
    --- a/src/win32/gf_win32_display.c Sun Dec 04 01:10:26 2011 -0600
    +++ b/src/win32/gf_win32_display.c Sun Dec 04 01:13:21 2011 -0600
    @@ -16,6 +16,17 @@
    * along with this program; if not, write to the Free Software
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA.
    */
    +#include <glib.h>
    +#include <gtk/gtk.h>
    +#include <gdk/gdk.h>
    +
    +#ifndef WINVER
    +# define WINVER 0x0500 /* This is Windows 2000 */
    +#endif /* WINVER */
    +
    +#include <windows.h>
    +typedef HMONITOR WINAPI GF_MonitorFromRect(LPCRECT,DWORD);
    +typedef BOOL WINAPI GF_GetMonitorInfo(HMONITOR,LPMONITORINFO);
    /*******************************************************************************
    * Uses _NET_WORKAREA or SPI_GETWORKAREA to get the geometry of a screen