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

windows emit wxCreateWindowEvent

Browse Source 
generic controls use wxINVERT for rubberbands etc
  wxXOR maps to GdkXOR etc


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-25 13:36:09 +00:00
parent 92b87be518
commit 3c679789bd
11 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/event.h
View File

@@ -478,6 +478,7 @@ public:
void SetOrientation(int orient) { m_extraLong = (long) orient; } void SetOrientation(int orient) { m_extraLong = (long) orient; }
void SetPosition(int pos) { m_commandInt = pos; } void SetPosition(int pos) { m_commandInt = pos; }
void CopyObject(wxObject& object_dest) const;
public: public:
int m_commandInt; // Additional information int m_commandInt; // Additional information
long m_extraLong; long m_extraLong;

10
src/common/event.cpp
View File

@@ -170,6 +170,16 @@ wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
m_commandInt = pos; m_commandInt = pos;
} }
void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
{
wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d;
wxEvent::CopyObject(obj_d);
obj->m_extraLong = m_extraLong;
obj->m_commandInt = m_commandInt;
}
/* /*
* Mouse events * Mouse events
* *

2
src/generic/listctrl.cpp
View File

@@ -781,7 +781,7 @@ void wxListHeaderWindow::DrawCurrent()
m_owner->ClientToScreen( &x2, &y2 ); m_owner->ClientToScreen( &x2, &y2 );
wxScreenDC dc; wxScreenDC dc;
dc.SetLogicalFunction( wxXOR ); dc.SetLogicalFunction( wxINVERT );
dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) ); dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.SetBrush( *wxTRANSPARENT_BRUSH );

2
src/generic/sashwin.cpp
View File

@@ -516,7 +516,7 @@ void wxSashWindow::DrawSashTracker(wxSashEdgePosition edge, int x, int y)
wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID); wxPen sashTrackerPen(*wxBLACK, 2, wxSOLID);
screenDC.SetLogicalFunction(wxXOR); screenDC.SetLogicalFunction(wxINVERT);
screenDC.SetPen(sashTrackerPen); screenDC.SetPen(sashTrackerPen);
screenDC.SetBrush(*wxTRANSPARENT_BRUSH); screenDC.SetBrush(*wxTRANSPARENT_BRUSH);

6
src/generic/splitter.cpp
View File

@@ -537,7 +537,7 @@ void wxSplitterWindow::DrawSashTracker(int x, int y)
ClientToScreen(&x1, &y1); ClientToScreen(&x1, &y1);
ClientToScreen(&x2, &y2); ClientToScreen(&x2, &y2);
screenDC.SetLogicalFunction(wxXOR); screenDC.SetLogicalFunction(wxINVERT);
screenDC.SetPen(*m_sashTrackerPen); screenDC.SetPen(*m_sashTrackerPen);
screenDC.SetBrush(*wxTRANSPARENT_BRUSH); screenDC.SetBrush(*wxTRANSPARENT_BRUSH);
@@ -599,9 +599,13 @@ void wxSplitterWindow::SizeWindows()
m_windowTwo->Layout(); m_windowTwo->Layout();
} }
} }
#ifdef __WXGTK__
Refresh();
#else
wxClientDC dc(this); wxClientDC dc(this);
DrawBorders(dc); DrawBorders(dc);
DrawSash(dc); DrawSash(dc);
#endif
} }
// Set pane for unsplit window // Set pane for unsplit window

24
src/gtk/dcclient.cpp
View File

@@ -973,19 +973,19 @@ void wxWindowDC::SetLogicalFunction( int function )
GdkFunction mode = GDK_COPY; GdkFunction mode = GDK_COPY;
switch (function) switch (function)
{ {
case wxXOR: mode = GDK_INVERT; break; case wxXOR: mode = GDK_XOR; break;
case wxINVERT: mode = GDK_XOR; break; case wxINVERT: mode = GDK_INVERT; break;
#if (GDK_MINOR_VERSION > 0) #if (GDK_MINOR_VERSION > 0)
case wxOR_REVERSE: mode = GDK_OR_REVERSE; break; case wxOR_REVERSE: mode = GDK_OR_REVERSE; break;
case wxAND_REVERSE: mode = GDK_AND_REVERSE; break; case wxAND_REVERSE: mode = GDK_AND_REVERSE; break;
case wxCLEAR: mode = GDK_CLEAR; break; case wxCLEAR: mode = GDK_CLEAR; break;
case wxSET: mode = GDK_SET; break; case wxSET: mode = GDK_SET; break;
case wxOR_INVERT: mode = GDK_OR_INVERT; break; case wxOR_INVERT: mode = GDK_OR_INVERT; break;
case wxAND: mode = GDK_AND; break; case wxAND: mode = GDK_AND; break;
case wxOR: mode = GDK_OR; break; case wxOR: mode = GDK_OR; break;
case wxEQUIV: mode = GDK_EQUIV; break; case wxEQUIV: mode = GDK_EQUIV; break;
case wxNAND: mode = GDK_NAND; break; case wxNAND: mode = GDK_NAND; break;
case wxAND_INVERT: mode = GDK_AND_INVERT; break; case wxAND_INVERT: mode = GDK_AND_INVERT; break;
/* ? wxSRC_INVERT GDK_AND_REVERSE, GDK_OR_REVERSE, GDK_OR_INVERT */ /* ? wxSRC_INVERT GDK_AND_REVERSE, GDK_OR_REVERSE, GDK_OR_INVERT */
#endif #endif
default: break; default: break;

14
src/gtk/textctrl.cpp
View File

@@ -44,10 +44,11 @@ extern bool g_blockEventsOnDrag;
static void static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
if (g_isIdle) wxapp_install_idle_handler();
if (!win->m_hasVMT) return; if (!win->m_hasVMT) return;
if (g_isIdle)
wxapp_install_idle_handler();
win->SetModified(); win->SetModified();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
@@ -63,11 +64,12 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
static void static void
gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (!win->m_hasVMT) return;
if (g_isIdle)
wxapp_install_idle_handler();
win->CalculateScrollbar(); win->CalculateScrollbar();
if (!win->m_hasVMT) return;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -273,7 +275,6 @@ void wxTextCtrl::CalculateScrollbar()
if (m_vScrollbarVisible) if (m_vScrollbarVisible)
{ {
gtk_widget_hide( m_vScrollbar ); gtk_widget_hide( m_vScrollbar );
m_vScrollbarVisible = FALSE; m_vScrollbarVisible = FALSE;
} }
} }
@@ -282,7 +283,6 @@ void wxTextCtrl::CalculateScrollbar()
if (!m_vScrollbarVisible) if (!m_vScrollbarVisible)
{ {
gtk_widget_show( m_vScrollbar ); gtk_widget_show( m_vScrollbar );
m_vScrollbarVisible = TRUE; m_vScrollbarVisible = TRUE;
} }
} }

4
src/gtk/window.cpp
View File

@@ -1541,6 +1541,10 @@ gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
win->SetForegroundColour( win->GetForegroundColour() ); win->SetForegroundColour( win->GetForegroundColour() );
win->SetCursor( win->GetCursor() ); win->SetCursor( win->GetCursor() );
wxWindowCreateEvent event( win );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE; return FALSE;
} }

24
src/gtk1/dcclient.cpp
View File

@@ -973,19 +973,19 @@ void wxWindowDC::SetLogicalFunction( int function )
GdkFunction mode = GDK_COPY; GdkFunction mode = GDK_COPY;
switch (function) switch (function)
{ {
case wxXOR: mode = GDK_INVERT; break; case wxXOR: mode = GDK_XOR; break;
case wxINVERT: mode = GDK_XOR; break; case wxINVERT: mode = GDK_INVERT; break;
#if (GDK_MINOR_VERSION > 0) #if (GDK_MINOR_VERSION > 0)
case wxOR_REVERSE: mode = GDK_OR_REVERSE; break; case wxOR_REVERSE: mode = GDK_OR_REVERSE; break;
case wxAND_REVERSE: mode = GDK_AND_REVERSE; break; case wxAND_REVERSE: mode = GDK_AND_REVERSE; break;
case wxCLEAR: mode = GDK_CLEAR; break; case wxCLEAR: mode = GDK_CLEAR; break;
case wxSET: mode = GDK_SET; break; case wxSET: mode = GDK_SET; break;
case wxOR_INVERT: mode = GDK_OR_INVERT; break; case wxOR_INVERT: mode = GDK_OR_INVERT; break;
case wxAND: mode = GDK_AND; break; case wxAND: mode = GDK_AND; break;
case wxOR: mode = GDK_OR; break; case wxOR: mode = GDK_OR; break;
case wxEQUIV: mode = GDK_EQUIV; break; case wxEQUIV: mode = GDK_EQUIV; break;
case wxNAND: mode = GDK_NAND; break; case wxNAND: mode = GDK_NAND; break;
case wxAND_INVERT: mode = GDK_AND_INVERT; break; case wxAND_INVERT: mode = GDK_AND_INVERT; break;
/* ? wxSRC_INVERT GDK_AND_REVERSE, GDK_OR_REVERSE, GDK_OR_INVERT */ /* ? wxSRC_INVERT GDK_AND_REVERSE, GDK_OR_REVERSE, GDK_OR_INVERT */
#endif #endif
default: break; default: break;

14
src/gtk1/textctrl.cpp
View File

@@ -44,10 +44,11 @@ extern bool g_blockEventsOnDrag;
static void static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
if (g_isIdle) wxapp_install_idle_handler();
if (!win->m_hasVMT) return; if (!win->m_hasVMT) return;
if (g_isIdle)
wxapp_install_idle_handler();
win->SetModified(); win->SetModified();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
@@ -63,11 +64,12 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
static void static void
gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
if (g_isIdle) wxapp_install_idle_handler(); if (!win->m_hasVMT) return;
if (g_isIdle)
wxapp_install_idle_handler();
win->CalculateScrollbar(); win->CalculateScrollbar();
if (!win->m_hasVMT) return;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -273,7 +275,6 @@ void wxTextCtrl::CalculateScrollbar()
if (m_vScrollbarVisible) if (m_vScrollbarVisible)
{ {
gtk_widget_hide( m_vScrollbar ); gtk_widget_hide( m_vScrollbar );
m_vScrollbarVisible = FALSE; m_vScrollbarVisible = FALSE;
} }
} }
@@ -282,7 +283,6 @@ void wxTextCtrl::CalculateScrollbar()
if (!m_vScrollbarVisible) if (!m_vScrollbarVisible)
{ {
gtk_widget_show( m_vScrollbar ); gtk_widget_show( m_vScrollbar );
m_vScrollbarVisible = TRUE; m_vScrollbarVisible = TRUE;
} }
} }

4
src/gtk1/window.cpp
View File

@@ -1541,6 +1541,10 @@ gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
win->SetForegroundColour( win->GetForegroundColour() ); win->SetForegroundColour( win->GetForegroundColour() );
win->SetCursor( win->GetCursor() ); win->SetCursor( win->GetCursor() );
wxWindowCreateEvent event( win );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE; return FALSE;
} }