projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
documentation for wxAppTraits (patch 1518295 from Francesco)
[wxWidgets.git]
/
src
/
gtk
/
minifram.cpp
diff --git
a/src/gtk/minifram.cpp
b/src/gtk/minifram.cpp
index 319159f69e2d5af298bea81df4b50ea4e195bae3..da857b0e6e0b487c3ce02d37c0c23a6c376db4d4 100644
(file)
--- a/
src/gtk/minifram.cpp
+++ b/
src/gtk/minifram.cpp
@@
-13,20
+13,16
@@
#if wxUSE_MINIFRAME
#include "wx/minifram.h"
#if wxUSE_MINIFRAME
#include "wx/minifram.h"
-#include "wx/settings.h"
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/dcscreen.h"
+ #include "wx/settings.h"
+ #include "wx/dcclient.h"
+ #include "wx/image.h"
#endif
#endif
-#include "gtk/gtk.h"
#include "wx/gtk/win_gtk.h"
#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
#include "wx/gtk/private.h"
-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
@@
-64,7
+60,7
@@
static wxColor LightContrastColour(const wxColour& c)
extern "C" {
static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win )
{
extern "C" {
static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxMiniFrame *win )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
if (!win->m_hasVMT) return;
if (gdk_event->count > 0) return;
if (!win->m_hasVMT) return;
if (gdk_event->count > 0) return;
@@
-80,11
+76,11
@@
static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
win->m_width, win->m_height);
int style = win->GetWindowStyle();
win->m_width, win->m_height);
int style = win->GetWindowStyle();
-
+
wxClientDC dc(win);
// Hack alert
dc.m_window = pizza->bin_window;
wxClientDC dc(win);
// Hack alert
dc.m_window = pizza->bin_window;
-
+
if (style & wxRESIZE_BORDER)
{
dc.SetBrush( *wxGREY_BRUSH );
if (style & wxRESIZE_BORDER)
{
dc.SetBrush( *wxGREY_BRUSH );
@@
-121,7
+117,7
@@
static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
extern "C" {
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
{
extern "C" {
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
@@
-136,7
+132,7
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
int y = (int)gdk_event->y;
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
int x = (int)gdk_event->x;
-
+
if ((style & wxRESIZE_BORDER) &&
(x > win->m_width-14) && (y > win->m_height-14))
{
if ((style & wxRESIZE_BORDER) &&
(x > win->m_width-14) && (y > win->m_height-14))
{
@@
-154,7
+150,7
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
org_x + x,
org_y + y,
0);
org_x + x,
org_y + y,
0);
-
+
return TRUE;
}
return TRUE;
}
@@
-167,7
+163,7
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
return TRUE;
}
}
return TRUE;
}
}
-
+
wxClientDC dc(win);
dc.SetFont( *wxSMALL_FONT );
int height = dc.GetCharHeight() + 1;
wxClientDC dc(win);
dc.SetFont( *wxSMALL_FONT );
int height = dc.GetCharHeight() + 1;
@@
-207,7
+203,7
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
extern "C" {
static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
{
extern "C" {
static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
@@
-242,14
+238,13
@@
extern "C" {
static gboolean
gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
{
static gboolean
gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
gdk_window_set_cursor( widget->window, NULL );
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
gdk_window_set_cursor( widget->window, NULL );
-
+
return FALSE;
}
}
return FALSE;
}
}
@@
-259,11
+254,10
@@
gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMin
//-----------------------------------------------------------------------------
extern "C" {
//-----------------------------------------------------------------------------
extern "C" {
-static gint
+static gint
gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
{
gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
+ // don't need to install idle handler, its done from "event" signal
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
@@
-281,10
+275,10
@@
gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
}
int style = win->GetWindowStyle();
}
int style = win->GetWindowStyle();
-
+
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
-
+
if (!win->m_isDragging)
{
if (style & wxRESIZE_BORDER)
if (!win->m_isDragging)
{
if (style & wxRESIZE_BORDER)
@@
-296,7
+290,7
@@
gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event,
}
return TRUE;
}
}
return TRUE;
}
-
+
win->m_oldX = x - win->m_diffX;
win->m_oldY = y - win->m_diffY;
win->m_oldX = x - win->m_diffX;
win->m_oldY = y - win->m_diffY;
projects / wxWidgets.git / blobdiff