Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving frames and dialogs now reports correct

Browse Source 
positions.

  Typo in BMP loading.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-01 07:38:28 +00:00
parent 6bbd334480
commit dfc3d7e025
5 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/image.cpp
View File

@@ -642,7 +642,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
planes = (int)word; planes = (int)word;
stream.Read(&word, 2); stream.Read(&word, 2);
bpp = (int)word; bpp = (int)word;
if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32) if (bpp!=1 && bpp!=4 && bpp!=8 && bpp !=16 && bpp!=24 && bpp!=32)
{ {
wxLogError( _T("unknown bitdepth in file\n") ); wxLogError( _T("unknown bitdepth in file\n") );
return FALSE; return FALSE;

10
src/gtk/dialog.cpp
View File

@@ -69,15 +69,19 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
// "configure_event" // "configure_event"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win ) static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
win->m_x = event->x; int x = 0;
win->m_y = event->y; int y = 0;
gdk_window_get_root_origin( win->m_widget->window, &x, &y );
win->m_x = x;
win->m_y = y;
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win ); mevent.SetEventObject( win );

10
src/gtk/frame.cpp
View File

@@ -146,15 +146,19 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
// "configure_event" // "configure_event"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
win->m_x = event->x; int x = 0;
win->m_y = event->y; int y = 0;
gdk_window_get_root_origin( win->m_widget->window, &x, &y );
win->m_x = x;
win->m_y = y;
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win ); mevent.SetEventObject( win );

10
src/gtk1/dialog.cpp
View File

@@ -69,15 +69,19 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
// "configure_event" // "configure_event"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win ) static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
win->m_x = event->x; int x = 0;
win->m_y = event->y; int y = 0;
gdk_window_get_root_origin( win->m_widget->window, &x, &y );
win->m_x = x;
win->m_y = y;
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win ); mevent.SetEventObject( win );

10
src/gtk1/frame.cpp
View File

@@ -146,15 +146,19 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
// "configure_event" // "configure_event"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win ) static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
{ {
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
win->m_x = event->x; int x = 0;
win->m_y = event->y; int y = 0;
gdk_window_get_root_origin( win->m_widget->window, &x, &y );
win->m_x = x;
win->m_y = y;
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() ); wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win ); mevent.SetEventObject( win );