AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small modifications to Vadims changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-05-10 11:02:43 +00:00
parent b6bc5bf37c
commit a2053b27b3
46 changed files with 983 additions and 820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/gtk/window.h
View File

@ -110,34 +110,11 @@ public:
// wxWindows callbacks
void OnKeyDown( wxKeyEvent &event );
// simple accessors
bool HasVMT() const { return m_hasVMT; }
int GetX() const { return m_x; }
int GetY() const { return m_y; }
int GetWidth() const { return m_width; }
int GetHeight() const { return m_height; }
GtkWidget *GetWxWindow() const { return m_wxwindow; }
GtkWidget *GetWidget() const { return GetHandle(); }
GtkAdjustment *GetHAdjust() const { return m_hAdjust; }
GtkAdjustment *GetVAdjust() const { return m_vAdjust; }
float GetOldHorizontalPos() const { return m_oldHorizontalPos; }
float GetOldVerticalPos() const { return m_oldVerticalPos; }
void SetOldHorizontalPos(float fpos) { m_oldHorizontalPos = fpos; }
void SetOldVerticalPos(float fpos) { m_oldVerticalPos = fpos; }
bool IsSizeSet() const { return m_sizeSet; }
// also sets the global flag
void SetScrolling(bool scroll);
bool HasScrolling() const { return m_hasScrolling; }
bool IsScrolling() const { return m_isScrolling; }
bool IsStaticBox() const { return m_isStaticBox; }
/* I don't want users to override what's done in idle so everything that
has to be done in idle time in order for wxGTK to work is done in
@ -180,12 +157,12 @@ public:
void InternalSetSize(int w, int h)
{ m_width = w; m_height = h; UpdateSize(); }
protected:
// position and size of the window
int m_x, m_y;
int m_width, m_height;
// see the docs in src/gtk/window.cpp
GtkWidget *m_widget;
GtkWidget *m_wxwindow;
// scrolling stuff

25
include/wx/gtk1/window.h
View File

@ -110,34 +110,11 @@ public:
// wxWindows callbacks
void OnKeyDown( wxKeyEvent &event );
// simple accessors
bool HasVMT() const { return m_hasVMT; }
int GetX() const { return m_x; }
int GetY() const { return m_y; }
int GetWidth() const { return m_width; }
int GetHeight() const { return m_height; }
GtkWidget *GetWxWindow() const { return m_wxwindow; }
GtkWidget *GetWidget() const { return GetHandle(); }
GtkAdjustment *GetHAdjust() const { return m_hAdjust; }
GtkAdjustment *GetVAdjust() const { return m_vAdjust; }
float GetOldHorizontalPos() const { return m_oldHorizontalPos; }
float GetOldVerticalPos() const { return m_oldVerticalPos; }
void SetOldHorizontalPos(float fpos) { m_oldHorizontalPos = fpos; }
void SetOldVerticalPos(float fpos) { m_oldVerticalPos = fpos; }
bool IsSizeSet() const { return m_sizeSet; }
// also sets the global flag
void SetScrolling(bool scroll);
bool HasScrolling() const { return m_hasScrolling; }
bool IsScrolling() const { return m_isScrolling; }
bool IsStaticBox() const { return m_isStaticBox; }
/* I don't want users to override what's done in idle so everything that
has to be done in idle time in order for wxGTK to work is done in
@ -180,12 +157,12 @@ public:
void InternalSetSize(int w, int h)
{ m_width = w; m_height = h; UpdateSize(); }
protected:
// position and size of the window
int m_x, m_y;
int m_width, m_height;
// see the docs in src/gtk/window.cpp
GtkWidget *m_widget;
GtkWidget *m_wxwindow;
// scrolling stuff

5
include/wx/window.h
View File

@ -595,10 +595,12 @@ public:
void OnSysColourChanged( wxSysColourChangedEvent& event );
void OnInitDialog( wxInitDialogEvent &event );
/*
What is this doing in the platform independent part?
// accessors
WXWidget GetHandle() const { return m_widget; }
protected:
// the window handle (for the underlying windowing system) and the window
// id - a number which uniquely identifies a window among its siblings
// unless it is -1
@ -609,6 +611,7 @@ protected:
WXWidget m_widget;
WXWidget m_hWnd;
};
*/
wxWindowID m_windowId;

2
src/common/wincmn.cpp
View File

@ -78,7 +78,7 @@ END_EVENT_TABLE()
void wxWindowBase::InitBase()
{
// no window yet, no parent nor children
m_widget = (WXWidget)0;
// m_widget = (WXWidget)0;
m_parent = (wxWindow *)NULL;
m_windowId = -1;
m_children.DeleteContents( FALSE ); // don't auto delete node data

10
src/gtk/bmpbuttn.cpp
View File

@ -43,7 +43,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
{
if (g_isIdle) wxapp_install_idle_handler();
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
@ -57,7 +57,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->HasFocus();
@ -69,7 +69,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->NotFocus();
@ -81,7 +81,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->StartSelect();
@ -93,7 +93,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->EndSelect();

2
src/gtk/button.cpp
View File

@ -43,7 +43,7 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());

2
src/gtk/checkbox.cpp
View File

@ -38,7 +38,7 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
{
if (g_isIdle) wxapp_install_idle_handler();
if (!cb->HasVMT()) return;
if (!cb->m_hasVMT) return;
if (cb->m_blockFirstEvent)
{

2
src/gtk/choice.cpp
View File

@ -38,7 +38,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!choice->HasVMT()) return;
if (!choice->m_hasVMT) return;
if (g_blockEventsOnDrag) return;

4
src/gtk/combobox.cpp
View File

@ -41,7 +41,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!combo->HasVMT()) return;
if (!combo->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
@ -70,6 +70,8 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!combo->m_hasVMT) return;
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() );
event.SetEventObject( combo );

8
src/gtk/dcclient.cpp
View File

@ -110,7 +110,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
if (!window) return;
GtkWidget *widget = window->GetWxWindow();
GtkWidget *widget = window->m_wxwindow;
if (!widget)
return;
@ -127,10 +127,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
/* still not realized ? */
if (!m_window) return;
if (window->GetWxWindow())
m_cmap = gtk_widget_get_colormap( window->GetWxWindow() );
if (window->m_wxwindow)
m_cmap = gtk_widget_get_colormap( window->m_wxwindow );
else
m_cmap = gtk_widget_get_colormap( window->GetHandle() );
m_cmap = gtk_widget_get_colormap( window->m_widget );
m_isMemDC = FALSE;

18
src/gtk/dialog.cpp
View File

@ -60,7 +60,7 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
/*
printf( "OnDialogResize from " );
@ -69,7 +69,7 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
printf( ".\n" );
*/
if ((win->GetWidth() != alloc->width) || (win->GetHeight() != alloc->height))
if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
{
win->InternalSetSize( alloc->width, alloc->height );
}
@ -83,11 +83,11 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
win->InternalSetPosition(event->x, event->y);
wxMoveEvent mevent( wxPoint(win->GetX(),win->GetY()), win->GetId() );
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( mevent );
@ -126,7 +126,7 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
{
/* I haven''t been able to set the position of
the dialog before it is shown, so I do it here */
gtk_widget_set_uposition( widget, win->GetX(), win->GetY() );
gtk_widget_set_uposition( widget, win->m_x, win->m_y );
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
@ -155,14 +155,14 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
func |= GDK_FUNC_RESIZE;
decor |= GDK_DECOR_RESIZEH;
}
gdk_window_set_decorations( win->GetHandle()->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->GetHandle()->window, (GdkWMFunction)func);
gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
/* GTK's shrinking/growing policy */
if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 0, 0, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
else
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 1, 1, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
return FALSE;
}

12
src/gtk/dnd.cpp
View File

@ -702,8 +702,8 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop
m_waiting = TRUE;
m_window = win;
m_widget = win->GetWidget();
if (win->GetWxWindow()) m_widget = win->GetWxWindow();
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_data = (wxDataBroker*) NULL;
m_retValue = wxDragCancel;
@ -722,8 +722,8 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
m_waiting = TRUE;
m_window = win;
m_widget = win->GetWidget();
if (win->GetWxWindow()) m_widget = win->GetWxWindow();
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
if (data)
@ -748,8 +748,8 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
{
m_window = win;
m_widget = win->GetWidget();
if (win->GetWxWindow()) m_widget = win->GetWxWindow();
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
m_data = data;

2
src/gtk/filedlg.cpp
View File

@ -57,7 +57,7 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
int style = dialog->GetStyle();
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->GetHandle());
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
char *filename = gtk_file_selection_get_filename(filedlg);
if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )

76
src/gtk/frame.cpp
View File

@ -64,7 +64,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
/*
printf( "OnFrameResize from " );
@ -73,7 +73,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
printf( ".\n" );
*/
if ((win->GetWidth() != alloc->width) || (win->GetHeight() != alloc->height))
if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
{
win->InternalSetSize( alloc->width, alloc->height );
}
@ -107,7 +107,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_menuBarDetached = FALSE;
win->UpdateSize();
@ -121,7 +121,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_menuBarDetached = TRUE;
win->UpdateSize();
@ -135,7 +135,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_toolBarDetached = FALSE;
win->UpdateSize();
@ -149,7 +149,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_toolBarDetached = TRUE;
win->UpdateSize();
@ -163,11 +163,11 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
win->InternalSetPosition(event->x, event->y);
wxMoveEvent mevent( wxPoint(win->GetX(),win->GetY()), win->GetId() );
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( mevent );
@ -215,14 +215,14 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
}
gdk_window_set_decorations( win->GetHandle()->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->GetHandle()->window, (GdkWMFunction)func);
gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
/* GTK's shrinking/growing policy */
if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 0, 0, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
else
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 1, 1, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
/* reset the icon */
if (win->m_icon != wxNullIcon)
@ -269,11 +269,11 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
/* these are outside the client area */
wxFrame* frame = (wxFrame*) parent;
gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
GTK_WIDGET(child->GetHandle()),
child->GetX(),
child->GetY(),
child->GetWidth(),
child->GetHeight() );
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_y,
child->m_width,
child->m_height );
/* we connect to these events for recalculating the client area
space when the toolbar is floating */
@ -282,10 +282,10 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
wxToolBar *toolBar = (wxToolBar*) child;
if (toolBar->GetWindowStyle() & wxTB_DOCKABLE)
{
gtk_signal_connect( GTK_OBJECT(toolBar->GetHandle()), "child_attached",
gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached",
GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent );
gtk_signal_connect( GTK_OBJECT(toolBar->GetHandle()), "child_detached",
gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached",
GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent );
}
}
@ -293,12 +293,12 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
else
{
/* these are inside the client area */
gtk_myfixed_put( GTK_MYFIXED(parent->GetWxWindow()),
GTK_WIDGET(child->GetHandle()),
child->GetX(),
child->GetY(),
child->GetWidth(),
child->GetHeight() );
gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_y,
child->m_width,
child->m_height );
}
/* resize on OnInternalIdle */
@ -671,7 +671,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_frameMenuBar->InternalSetPosition(xx, yy);
m_frameMenuBar->InternalSetSize(ww, hh);
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
m_frameMenuBar->GetHandle(),
m_frameMenuBar->m_widget,
xx, yy, ww, hh );
client_area_y_offset += hh;
}
@ -688,7 +688,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
yy += wxPLACE_HOLDER;
}
int ww = m_width - 2*m_miniEdge;
int hh = m_frameToolBar->GetHeight();
int hh = m_frameToolBar->m_height;
// VZ: according to earlier comments in this file, the tbar height
// shouldn't be changed, so I comment out the next line
// (09.05.99)
@ -698,7 +698,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_frameToolBar->InternalSetSize(ww, hh);
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
m_frameToolBar->GetHandle(),
m_frameToolBar->m_widget,
xx, yy, ww, hh );
client_area_y_offset += hh;
}
@ -726,7 +726,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_frameStatusBar->InternalSetPosition(xx, yy);
m_frameStatusBar->InternalSetSize(ww, hh);
gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
m_frameStatusBar->GetHandle(),
m_frameStatusBar->m_widget,
xx, yy, ww, hh );
}
@ -743,7 +743,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
/* send size event to status bar */
if (m_frameStatusBar)
{
wxSizeEvent event2( wxSize(m_frameStatusBar->GetWidth(),m_frameStatusBar->GetHeight()), m_frameStatusBar->GetId() );
wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
event2.SetEventObject( m_frameStatusBar );
m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
}
@ -808,7 +808,7 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
#if (GTK_MINOR_VERSION > 0)
/* support for native hot keys */
gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->GetHandle()));
gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->m_widget));
#endif
wxNode *node = menu->GetItems().First();
@ -847,18 +847,18 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
{
m_frameMenuBar->SetParent(this);
gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
m_frameMenuBar->GetHandle(),
m_frameMenuBar->GetX(),
m_frameMenuBar->GetY(),
m_frameMenuBar->GetWidth(),
m_frameMenuBar->GetHeight() );
m_frameMenuBar->m_widget,
m_frameMenuBar->m_x,
m_frameMenuBar->m_y,
m_frameMenuBar->m_width,
m_frameMenuBar->m_height );
if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
{
gtk_signal_connect( GTK_OBJECT(menuBar->GetHandle()), "child_attached",
gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(menuBar->GetHandle()), "child_detached",
gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
}
}

6
src/gtk/listbox.cpp
View File

@ -76,7 +76,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
if (g_blockEventsOnDrag) return FALSE;
if (g_blockEventsOnScroll) return FALSE;
if (!listbox->HasVMT()) return FALSE;
if (!listbox->m_hasVMT) return FALSE;
int sel = listbox->GetIndex( widget );
@ -130,7 +130,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
if (g_blockEventsOnDrag) return FALSE;
if (!listbox->HasVMT()) return FALSE;
if (!listbox->m_hasVMT) return FALSE;
if (gdk_event->keyval != ' ') return FALSE;
@ -156,7 +156,7 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
{
if (g_isIdle) wxapp_install_idle_handler();
if (!listbox->HasVMT()) return;
if (!listbox->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );

38
src/gtk/mdi.cpp
View File

@ -90,12 +90,12 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
wxMenuBar *menu_bar = child_frame->m_menuBar;
if (!menu_bar) return;
if (!menu_bar->GetHandle()) return;
if (!menu_bar->m_widget) return;
menu_bar->InternalSetPosition(0, 0);
menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT);
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
menu_bar->GetHandle(),
menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT );
}
@ -108,7 +108,7 @@ void wxMDIParentFrame::OnInternalIdle()
if (m_justInserted)
{
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->GetHandle());
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
m_justInserted = FALSE;
@ -128,11 +128,11 @@ void wxMDIParentFrame::OnInternalIdle()
{
if (child_frame == active_child_frame)
{
gtk_widget_show( child_frame->m_menuBar->GetHandle() );
gtk_widget_show( child_frame->m_menuBar->m_widget );
visible_child_menu = TRUE;
}
else
gtk_widget_hide( child_frame->m_menuBar->GetHandle() );
gtk_widget_hide( child_frame->m_menuBar->m_widget );
}
node = node->Next();
}
@ -150,7 +150,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
{
if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->GetHandle());
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
if (!notebook) return (wxMDIChildFrame*) NULL;
#if (GTK_MINOR_VERSION > 0)
@ -189,13 +189,13 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
void wxMDIParentFrame::ActivateNext()
{
if (m_clientWindow)
gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->GetHandle()) );
gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
}
void wxMDIParentFrame::ActivatePrevious()
{
if (m_clientWindow)
gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->GetHandle()) );
gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
}
void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
@ -293,12 +293,12 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
}
/* the menu bar of the child window is shown in idle time as needed */
gtk_widget_hide( m_menuBar->GetHandle() );
gtk_widget_hide( m_menuBar->m_widget );
/* insert the invisible menu bar into the _parent_ mdi frame */
gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget),
m_menuBar->GetHandle(),
0, 0, mdi_frame->GetWidth(), wxMENU_HEIGHT );
m_menuBar->m_widget,
0, 0, mdi_frame->m_width, wxMENU_HEIGHT );
}
}
@ -323,11 +323,11 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
{
if (g_isIdle) wxapp_install_idle_handler();
if ((win->GetX() == alloc->x) &&
(win->GetY() == alloc->y) &&
(win->GetWidth() == alloc->width) &&
(win->GetHeight() == alloc->height) &&
(win->IsSizeSet()))
if ((win->m_x == alloc->x) &&
(win->m_y == alloc->y) &&
(win->m_width == alloc->width) &&
(win->m_height == alloc->height) &&
(win->m_sizeSet))
{
return;
}
@ -347,12 +347,12 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
gtk_signal_connect( GTK_OBJECT(child->GetHandle()), "size_allocate",
gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
GtkNotebook *notebook = GTK_NOTEBOOK(parent->GetHandle());
GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
gtk_notebook_append_page( notebook, child->GetHandle(), label_widget );
gtk_notebook_append_page( notebook, child->m_widget, label_widget );
child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);

28
src/gtk/minifram.cpp
View File

@ -65,7 +65,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (gdk_event->count > 0) return;
gtk_draw_shadow( widget->style,
@ -73,7 +73,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
0, 0,
win->GetWidth(), win->GetHeight() );
win->m_width, win->m_height );
if (!win->m_title.IsEmpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
@ -89,7 +89,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
gdk_draw_rectangle( widget->window, gc, TRUE,
x,
3,
win->GetWidth() - 4 - x,
win->m_width - 4 - x,
font->ascent + font->descent+1 );
gdk_gc_set_foreground( gc, &widget->style->white );
@ -110,14 +110,14 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
gtk_draw_shadow( widget->style,
widget->window,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
0, 0,
win->GetWidth(), win->GetHeight() );
win->m_width, win->m_height );
if (!win->m_title.IsEmpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
@ -133,7 +133,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
gdk_draw_rectangle( widget->window, gc, TRUE,
x,
3,
win->GetWidth() - 4 - x,
win->m_width - 4 - x,
font->ascent + font->descent+1 );
gdk_gc_set_foreground( gc, &widget->style->white );
@ -154,7 +154,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
@ -174,7 +174,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
win->m_diffX = (int)gdk_event->x;
win->m_diffY = (int)gdk_event->y;
DrawFrame( widget, 0, 0, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, 0, 0, win->m_width, win->m_height );
win->m_oldX = 0;
win->m_oldY = 0;
@ -191,7 +191,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
@ -202,7 +202,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
DrawFrame( widget, win->m_oldX, win->m_oldY, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
gdk_pointer_ungrab ( GDK_CURRENT_TIME );
int org_x = 0;
int org_y = 0;
@ -210,7 +210,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
x += org_x - win->m_diffX;
y += org_y - win->m_diffY;
win->InternalSetPosition(x, y);
gtk_widget_set_uposition( win->GetWidget(), x, y );
gtk_widget_set_uposition( win->m_widget, x, y );
return TRUE;
}
@ -223,7 +223,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
@ -240,10 +240,10 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
gdk_event->state = state;
}
DrawFrame( widget, win->m_oldX, win->m_oldY, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
win->m_oldX = (int)gdk_event->x - win->m_diffX;
win->m_oldY = (int)gdk_event->y - win->m_diffY;
DrawFrame( widget, win->m_oldX, win->m_oldY, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
return TRUE;
}

16
src/gtk/notebook.cpp
View File

@ -125,10 +125,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
{
if (g_isIdle) wxapp_install_idle_handler();
if ((win->GetX() == alloc->x) &&
(win->GetY() == alloc->y) &&
(win->GetWidth() == alloc->width) &&
(win->GetHeight() == alloc->height))
if ((win->m_x == alloc->x) &&
(win->m_y == alloc->y) &&
(win->m_width == alloc->width) &&
(win->m_height == alloc->height))
{
return;
}
@ -149,7 +149,7 @@ gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNo
if (g_blockEventsOnDrag) return FALSE;
if (!notebook->HasVMT()) return FALSE;
if (!notebook->m_hasVMT) return FALSE;
/* this code makes jumping down from the handles of the notebooks
to the actual items in the visible notebook page possible with
@ -188,16 +188,16 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
page->m_box = gtk_hbox_new (FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
GtkNotebook *notebook = GTK_NOTEBOOK(parent->GetWidget());
GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
page->m_client = child;
gtk_notebook_append_page( notebook, child->GetWidget(), page->m_box );
gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
page->m_parent = notebook;
gtk_signal_connect( GTK_OBJECT(child->GetWidget()), "size_allocate",
gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
wxASSERT_MSG( page->m_page, _T("Notebook page creation error") );

10
src/gtk/radiobox.cpp
View File

@ -40,7 +40,7 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->HasVMT()) return;
if (!rb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
if (rb->m_alreadySent)
@ -108,7 +108,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
gtk_myfixed_put( GTK_MYFIXED(m_parent->GetWxWindow()),
gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
GTK_WIDGET(m_radio),
m_x+10, m_y+10+(i*24), 10, 10 );
}
@ -179,7 +179,7 @@ wxSize wxRadioBox::LayoutItems()
int len = 22+gdk_string_measure( font, label->label );
if (len > max_len) max_len = len;
gtk_myfixed_move( GTK_MYFIXED(m_parent->GetWxWindow()), button, m_x+x, m_y+y );
gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
y += 20;
node = node->Next();
@ -193,7 +193,7 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_myfixed_resize( GTK_MYFIXED(m_parent->GetWxWindow()), button, max_len, 20 );
gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 );
node = node->Next();
if (!node) break;
@ -229,7 +229,7 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_myfixed_set_size( GTK_MYFIXED(m_parent->GetWxWindow()), button, m_x+x, m_y+y, max, 20 );
gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
x += max;
node = node->Next();

2
src/gtk/radiobut.cpp
View File

@ -38,7 +38,7 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButto
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->HasVMT()) return;
if (!rb->m_hasVMT) return;
if (rb->m_blockFirstEvent)
{

2
src/gtk/scrolbar.cpp
View File

@ -41,7 +41,7 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;

2
src/gtk/slider.cpp
View File

@ -39,7 +39,7 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;

2
src/gtk/spinbutt.cpp
View File

@ -42,7 +42,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;

4
src/gtk/textctrl.cpp
View File

@ -46,7 +46,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->SetModified();
@ -67,7 +67,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
win->CalculateScrollbar();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
}
//-----------------------------------------------------------------------------

627
src/gtk/window.cpp
View File

File diff suppressed because it is too large Load Diff

10
src/gtk1/bmpbuttn.cpp
View File

@ -43,7 +43,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
{
if (g_isIdle) wxapp_install_idle_handler();
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());
@ -57,7 +57,7 @@ static void gtk_bmpbutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxBitma
static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->HasFocus();
@ -69,7 +69,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->NotFocus();
@ -81,7 +81,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->StartSelect();
@ -93,7 +93,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitmapButton *button )
{
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
button->EndSelect();

2
src/gtk1/button.cpp
View File

@ -43,7 +43,7 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxButton *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!button->HasVMT()) return;
if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, button->GetId());

2
src/gtk1/checkbox.cpp
View File

@ -38,7 +38,7 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
{
if (g_isIdle) wxapp_install_idle_handler();
if (!cb->HasVMT()) return;
if (!cb->m_hasVMT) return;
if (cb->m_blockFirstEvent)
{

2
src/gtk1/choice.cpp
View File

@ -38,7 +38,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!choice->HasVMT()) return;
if (!choice->m_hasVMT) return;
if (g_blockEventsOnDrag) return;

4
src/gtk1/combobox.cpp
View File

@ -41,7 +41,7 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!combo->HasVMT()) return;
if (!combo->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
@ -70,6 +70,8 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!combo->m_hasVMT) return;
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( combo->GetValue() );
event.SetEventObject( combo );

8
src/gtk1/dcclient.cpp
View File

@ -110,7 +110,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
if (!window) return;
GtkWidget *widget = window->GetWxWindow();
GtkWidget *widget = window->m_wxwindow;
if (!widget)
return;
@ -127,10 +127,10 @@ wxWindowDC::wxWindowDC( wxWindow *window )
/* still not realized ? */
if (!m_window) return;
if (window->GetWxWindow())
m_cmap = gtk_widget_get_colormap( window->GetWxWindow() );
if (window->m_wxwindow)
m_cmap = gtk_widget_get_colormap( window->m_wxwindow );
else
m_cmap = gtk_widget_get_colormap( window->GetHandle() );
m_cmap = gtk_widget_get_colormap( window->m_widget );
m_isMemDC = FALSE;

18
src/gtk1/dialog.cpp
View File

@ -60,7 +60,7 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
/*
printf( "OnDialogResize from " );
@ -69,7 +69,7 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
printf( ".\n" );
*/
if ((win->GetWidth() != alloc->width) || (win->GetHeight() != alloc->height))
if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
{
win->InternalSetSize( alloc->width, alloc->height );
}
@ -83,11 +83,11 @@ static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEvent
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
win->InternalSetPosition(event->x, event->y);
wxMoveEvent mevent( wxPoint(win->GetX(),win->GetY()), win->GetId() );
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( mevent );
@ -126,7 +126,7 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
{
/* I haven''t been able to set the position of
the dialog before it is shown, so I do it here */
gtk_widget_set_uposition( widget, win->GetX(), win->GetY() );
gtk_widget_set_uposition( widget, win->m_x, win->m_y );
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
@ -155,14 +155,14 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
func |= GDK_FUNC_RESIZE;
decor |= GDK_DECOR_RESIZEH;
}
gdk_window_set_decorations( win->GetHandle()->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->GetHandle()->window, (GdkWMFunction)func);
gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
/* GTK's shrinking/growing policy */
if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 0, 0, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
else
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 1, 1, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
return FALSE;
}

12
src/gtk1/dnd.cpp
View File

@ -702,8 +702,8 @@ wxDropSource::wxDropSource( wxWindow *win, const wxIcon &go, const wxIcon &stop
m_waiting = TRUE;
m_window = win;
m_widget = win->GetWidget();
if (win->GetWxWindow()) m_widget = win->GetWxWindow();
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_data = (wxDataBroker*) NULL;
m_retValue = wxDragCancel;
@ -722,8 +722,8 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
m_waiting = TRUE;
m_window = win;
m_widget = win->GetWidget();
if (win->GetWxWindow()) m_widget = win->GetWxWindow();
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
if (data)
@ -748,8 +748,8 @@ wxDropSource::wxDropSource( wxDataObject *data, wxWindow *win, const wxIcon &go,
wxDropSource::wxDropSource( wxDataBroker *data, wxWindow *win )
{
m_window = win;
m_widget = win->GetWidget();
if (win->GetWxWindow()) m_widget = win->GetWxWindow();
m_widget = win->m_widget;
if (win->m_wxwindow) m_widget = win->m_wxwindow;
m_retValue = wxDragCancel;
m_data = data;

2
src/gtk1/filedlg.cpp
View File

@ -57,7 +57,7 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
int style = dialog->GetStyle();
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->GetHandle());
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
char *filename = gtk_file_selection_get_filename(filedlg);
if ( (style & wxSAVE) && ( style & wxOVERWRITE_PROMPT ) )

76
src/gtk1/frame.cpp
View File

@ -64,7 +64,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
/*
printf( "OnFrameResize from " );
@ -73,7 +73,7 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
printf( ".\n" );
*/
if ((win->GetWidth() != alloc->width) || (win->GetHeight() != alloc->height))
if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
{
win->InternalSetSize( alloc->width, alloc->height );
}
@ -107,7 +107,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_menuBarDetached = FALSE;
win->UpdateSize();
@ -121,7 +121,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_menuBarDetached = TRUE;
win->UpdateSize();
@ -135,7 +135,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_toolBarDetached = FALSE;
win->UpdateSize();
@ -149,7 +149,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->m_toolBarDetached = TRUE;
win->UpdateSize();
@ -163,11 +163,11 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
win->InternalSetPosition(event->x, event->y);
wxMoveEvent mevent( wxPoint(win->GetX(),win->GetY()), win->GetId() );
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( mevent );
@ -215,14 +215,14 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
}
gdk_window_set_decorations( win->GetHandle()->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->GetHandle()->window, (GdkWMFunction)func);
gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
/* GTK's shrinking/growing policy */
if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 0, 0, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
else
gtk_window_set_policy(GTK_WINDOW(win->GetHandle()), 1, 1, 1);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
/* reset the icon */
if (win->m_icon != wxNullIcon)
@ -269,11 +269,11 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
/* these are outside the client area */
wxFrame* frame = (wxFrame*) parent;
gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
GTK_WIDGET(child->GetHandle()),
child->GetX(),
child->GetY(),
child->GetWidth(),
child->GetHeight() );
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_y,
child->m_width,
child->m_height );
/* we connect to these events for recalculating the client area
space when the toolbar is floating */
@ -282,10 +282,10 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
wxToolBar *toolBar = (wxToolBar*) child;
if (toolBar->GetWindowStyle() & wxTB_DOCKABLE)
{
gtk_signal_connect( GTK_OBJECT(toolBar->GetHandle()), "child_attached",
gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached",
GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent );
gtk_signal_connect( GTK_OBJECT(toolBar->GetHandle()), "child_detached",
gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached",
GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent );
}
}
@ -293,12 +293,12 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
else
{
/* these are inside the client area */
gtk_myfixed_put( GTK_MYFIXED(parent->GetWxWindow()),
GTK_WIDGET(child->GetHandle()),
child->GetX(),
child->GetY(),
child->GetWidth(),
child->GetHeight() );
gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
GTK_WIDGET(child->m_widget),
child->m_x,
child->m_y,
child->m_width,
child->m_height );
}
/* resize on OnInternalIdle */
@ -671,7 +671,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_frameMenuBar->InternalSetPosition(xx, yy);
m_frameMenuBar->InternalSetSize(ww, hh);
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
m_frameMenuBar->GetHandle(),
m_frameMenuBar->m_widget,
xx, yy, ww, hh );
client_area_y_offset += hh;
}
@ -688,7 +688,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
yy += wxPLACE_HOLDER;
}
int ww = m_width - 2*m_miniEdge;
int hh = m_frameToolBar->GetHeight();
int hh = m_frameToolBar->m_height;
// VZ: according to earlier comments in this file, the tbar height
// shouldn't be changed, so I comment out the next line
// (09.05.99)
@ -698,7 +698,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_frameToolBar->InternalSetSize(ww, hh);
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
m_frameToolBar->GetHandle(),
m_frameToolBar->m_widget,
xx, yy, ww, hh );
client_area_y_offset += hh;
}
@ -726,7 +726,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_frameStatusBar->InternalSetPosition(xx, yy);
m_frameStatusBar->InternalSetSize(ww, hh);
gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
m_frameStatusBar->GetHandle(),
m_frameStatusBar->m_widget,
xx, yy, ww, hh );
}
@ -743,7 +743,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
/* send size event to status bar */
if (m_frameStatusBar)
{
wxSizeEvent event2( wxSize(m_frameStatusBar->GetWidth(),m_frameStatusBar->GetHeight()), m_frameStatusBar->GetId() );
wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
event2.SetEventObject( m_frameStatusBar );
m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
}
@ -808,7 +808,7 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
#if (GTK_MINOR_VERSION > 0)
/* support for native hot keys */
gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->GetHandle()));
gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->m_widget));
#endif
wxNode *node = menu->GetItems().First();
@ -847,18 +847,18 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
{
m_frameMenuBar->SetParent(this);
gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
m_frameMenuBar->GetHandle(),
m_frameMenuBar->GetX(),
m_frameMenuBar->GetY(),
m_frameMenuBar->GetWidth(),
m_frameMenuBar->GetHeight() );
m_frameMenuBar->m_widget,
m_frameMenuBar->m_x,
m_frameMenuBar->m_y,
m_frameMenuBar->m_width,
m_frameMenuBar->m_height );
if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
{
gtk_signal_connect( GTK_OBJECT(menuBar->GetHandle()), "child_attached",
gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
gtk_signal_connect( GTK_OBJECT(menuBar->GetHandle()), "child_detached",
gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
}
}

6
src/gtk1/listbox.cpp
View File

@ -76,7 +76,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
if (g_blockEventsOnDrag) return FALSE;
if (g_blockEventsOnScroll) return FALSE;
if (!listbox->HasVMT()) return FALSE;
if (!listbox->m_hasVMT) return FALSE;
int sel = listbox->GetIndex( widget );
@ -130,7 +130,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
if (g_blockEventsOnDrag) return FALSE;
if (!listbox->HasVMT()) return FALSE;
if (!listbox->m_hasVMT) return FALSE;
if (gdk_event->keyval != ' ') return FALSE;
@ -156,7 +156,7 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
{
if (g_isIdle) wxapp_install_idle_handler();
if (!listbox->HasVMT()) return;
if (!listbox->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );

38
src/gtk1/mdi.cpp
View File

@ -90,12 +90,12 @@ void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
wxMenuBar *menu_bar = child_frame->m_menuBar;
if (!menu_bar) return;
if (!menu_bar->GetHandle()) return;
if (!menu_bar->m_widget) return;
menu_bar->InternalSetPosition(0, 0);
menu_bar->InternalSetSize(m_width, wxMENU_HEIGHT);
gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
menu_bar->GetHandle(),
menu_bar->m_widget,
0, 0, m_width, wxMENU_HEIGHT );
}
@ -108,7 +108,7 @@ void wxMDIParentFrame::OnInternalIdle()
if (m_justInserted)
{
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->GetHandle());
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 );
m_justInserted = FALSE;
@ -128,11 +128,11 @@ void wxMDIParentFrame::OnInternalIdle()
{
if (child_frame == active_child_frame)
{
gtk_widget_show( child_frame->m_menuBar->GetHandle() );
gtk_widget_show( child_frame->m_menuBar->m_widget );
visible_child_menu = TRUE;
}
else
gtk_widget_hide( child_frame->m_menuBar->GetHandle() );
gtk_widget_hide( child_frame->m_menuBar->m_widget );
}
node = node->Next();
}
@ -150,7 +150,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
{
if (!m_clientWindow) return (wxMDIChildFrame*) NULL;
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->GetHandle());
GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget);
if (!notebook) return (wxMDIChildFrame*) NULL;
#if (GTK_MINOR_VERSION > 0)
@ -189,13 +189,13 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
void wxMDIParentFrame::ActivateNext()
{
if (m_clientWindow)
gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->GetHandle()) );
gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
}
void wxMDIParentFrame::ActivatePrevious()
{
if (m_clientWindow)
gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->GetHandle()) );
gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) );
}
void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) )
@ -293,12 +293,12 @@ void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar )
}
/* the menu bar of the child window is shown in idle time as needed */
gtk_widget_hide( m_menuBar->GetHandle() );
gtk_widget_hide( m_menuBar->m_widget );
/* insert the invisible menu bar into the _parent_ mdi frame */
gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_mainWidget),
m_menuBar->GetHandle(),
0, 0, mdi_frame->GetWidth(), wxMENU_HEIGHT );
m_menuBar->m_widget,
0, 0, mdi_frame->m_width, wxMENU_HEIGHT );
}
}
@ -323,11 +323,11 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
{
if (g_isIdle) wxapp_install_idle_handler();
if ((win->GetX() == alloc->x) &&
(win->GetY() == alloc->y) &&
(win->GetWidth() == alloc->width) &&
(win->GetHeight() == alloc->height) &&
(win->IsSizeSet()))
if ((win->m_x == alloc->x) &&
(win->m_y == alloc->y) &&
(win->m_width == alloc->width) &&
(win->m_height == alloc->height) &&
(win->m_sizeSet))
{
return;
}
@ -347,12 +347,12 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil
GtkWidget *label_widget = gtk_label_new( s.mbc_str() );
gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
gtk_signal_connect( GTK_OBJECT(child->GetHandle()), "size_allocate",
gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
GtkNotebook *notebook = GTK_NOTEBOOK(parent->GetHandle());
GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
gtk_notebook_append_page( notebook, child->GetHandle(), label_widget );
gtk_notebook_append_page( notebook, child->m_widget, label_widget );
child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);

28
src/gtk1/minifram.cpp
View File

@ -65,7 +65,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (gdk_event->count > 0) return;
gtk_draw_shadow( widget->style,
@ -73,7 +73,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
0, 0,
win->GetWidth(), win->GetHeight() );
win->m_width, win->m_height );
if (!win->m_title.IsEmpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
@ -89,7 +89,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
gdk_draw_rectangle( widget->window, gc, TRUE,
x,
3,
win->GetWidth() - 4 - x,
win->m_width - 4 - x,
font->ascent + font->descent+1 );
gdk_gc_set_foreground( gc, &widget->style->white );
@ -110,14 +110,14 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
gtk_draw_shadow( widget->style,
widget->window,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
0, 0,
win->GetWidth(), win->GetHeight() );
win->m_width, win->m_height );
if (!win->m_title.IsEmpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
@ -133,7 +133,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
gdk_draw_rectangle( widget->window, gc, TRUE,
x,
3,
win->GetWidth() - 4 - x,
win->m_width - 4 - x,
font->ascent + font->descent+1 );
gdk_gc_set_foreground( gc, &widget->style->white );
@ -154,7 +154,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
@ -174,7 +174,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
win->m_diffX = (int)gdk_event->x;
win->m_diffY = (int)gdk_event->y;
DrawFrame( widget, 0, 0, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, 0, 0, win->m_width, win->m_height );
win->m_oldX = 0;
win->m_oldY = 0;
@ -191,7 +191,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
@ -202,7 +202,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
DrawFrame( widget, win->m_oldX, win->m_oldY, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
gdk_pointer_ungrab ( GDK_CURRENT_TIME );
int org_x = 0;
int org_y = 0;
@ -210,7 +210,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
x += org_x - win->m_diffX;
y += org_y - win->m_diffY;
win->InternalSetPosition(x, y);
gtk_widget_set_uposition( win->GetWidget(), x, y );
gtk_widget_set_uposition( win->m_widget, x, y );
return TRUE;
}
@ -223,7 +223,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return FALSE;
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
@ -240,10 +240,10 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
gdk_event->state = state;
}
DrawFrame( widget, win->m_oldX, win->m_oldY, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
win->m_oldX = (int)gdk_event->x - win->m_diffX;
win->m_oldY = (int)gdk_event->y - win->m_diffY;
DrawFrame( widget, win->m_oldX, win->m_oldY, win->GetWidth(), win->GetHeight() );
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
return TRUE;
}

16
src/gtk1/notebook.cpp
View File

@ -125,10 +125,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
{
if (g_isIdle) wxapp_install_idle_handler();
if ((win->GetX() == alloc->x) &&
(win->GetY() == alloc->y) &&
(win->GetWidth() == alloc->width) &&
(win->GetHeight() == alloc->height))
if ((win->m_x == alloc->x) &&
(win->m_y == alloc->y) &&
(win->m_width == alloc->width) &&
(win->m_height == alloc->height))
{
return;
}
@ -149,7 +149,7 @@ gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxNo
if (g_blockEventsOnDrag) return FALSE;
if (!notebook->HasVMT()) return FALSE;
if (!notebook->m_hasVMT) return FALSE;
/* this code makes jumping down from the handles of the notebooks
to the actual items in the visible notebook page possible with
@ -188,16 +188,16 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
page->m_box = gtk_hbox_new (FALSE, 0);
gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
GtkNotebook *notebook = GTK_NOTEBOOK(parent->GetWidget());
GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget);
page->m_client = child;
gtk_notebook_append_page( notebook, child->GetWidget(), page->m_box );
gtk_notebook_append_page( notebook, child->m_widget, page->m_box );
page->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data);
page->m_parent = notebook;
gtk_signal_connect( GTK_OBJECT(child->GetWidget()), "size_allocate",
gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child );
wxASSERT_MSG( page->m_page, _T("Notebook page creation error") );

10
src/gtk1/radiobox.cpp
View File

@ -40,7 +40,7 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->HasVMT()) return;
if (!rb->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
if (rb->m_alreadySent)
@ -108,7 +108,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
gtk_myfixed_put( GTK_MYFIXED(m_parent->GetWxWindow()),
gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow),
GTK_WIDGET(m_radio),
m_x+10, m_y+10+(i*24), 10, 10 );
}
@ -179,7 +179,7 @@ wxSize wxRadioBox::LayoutItems()
int len = 22+gdk_string_measure( font, label->label );
if (len > max_len) max_len = len;
gtk_myfixed_move( GTK_MYFIXED(m_parent->GetWxWindow()), button, m_x+x, m_y+y );
gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
y += 20;
node = node->Next();
@ -193,7 +193,7 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_myfixed_resize( GTK_MYFIXED(m_parent->GetWxWindow()), button, max_len, 20 );
gtk_myfixed_resize( GTK_MYFIXED(m_parent->m_wxwindow), button, max_len, 20 );
node = node->Next();
if (!node) break;
@ -229,7 +229,7 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_myfixed_set_size( GTK_MYFIXED(m_parent->GetWxWindow()), button, m_x+x, m_y+y, max, 20 );
gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
x += max;
node = node->Next();

2
src/gtk1/radiobut.cpp
View File

@ -38,7 +38,7 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButto
{
if (g_isIdle) wxapp_install_idle_handler();
if (!rb->HasVMT()) return;
if (!rb->m_hasVMT) return;
if (rb->m_blockFirstEvent)
{

2
src/gtk1/scrolbar.cpp
View File

@ -41,7 +41,7 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;

2
src/gtk1/slider.cpp
View File

@ -39,7 +39,7 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;

2
src/gtk1/spinbutt.cpp
View File

@ -42,7 +42,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;

4
src/gtk1/textctrl.cpp
View File

@ -46,7 +46,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
if (g_isIdle) wxapp_install_idle_handler();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
win->SetModified();
@ -67,7 +67,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
win->CalculateScrollbar();
if (!win->HasVMT()) return;
if (!win->m_hasVMT) return;
}
//-----------------------------------------------------------------------------

627
src/gtk1/window.cpp
View File

File diff suppressed because it is too large Load Diff