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

replaced T() makro with wxT() due to namespace probs, _T() exists, too

Browse Source 
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-10-08 14:35:56 +00:00
parent b4a2ab728b
commit 223d09f6b5
336 changed files with 3755 additions and 3776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/gtk/window.cpp
View File

@@ -155,7 +155,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
wxLog::AddTraceMask("focus");
s_done = TRUE;
}
wxLogTrace(T("FOCUS NOW AT: %s"), name);
wxLogTrace(wxT("FOCUS NOW AT: %s"), name);
*/
return FALSE;
@@ -164,7 +164,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
{
wxString tmp = name;
tmp += T(" FROM ");
tmp += wxT(" FROM ");
tmp += window;
wxChar *s = new wxChar[tmp.Length()+1];
@@ -977,10 +977,10 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
wxapp_install_idle_handler();
/*
wxPrintf( T("1) OnButtonPress from ") );
wxPrintf( wxT("1) OnButtonPress from ") );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
wxPrintf( win->GetClassInfo()->GetClassName() );
wxPrintf( T(".\n") );
wxPrintf( wxT(".\n") );
*/
if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
@@ -995,20 +995,20 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
gtk_widget_grab_focus (win->m_wxwindow);
/*
wxPrintf( T("GrabFocus from ") );
wxPrintf( wxT("GrabFocus from ") );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
wxPrintf( win->GetClassInfo()->GetClassName() );
wxPrintf( T(".\n") );
wxPrintf( wxT(".\n") );
*/
}
}
/*
wxPrintf( T("2) OnButtonPress from ") );
wxPrintf( wxT("2) OnButtonPress from ") );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
wxPrintf( win->GetClassInfo()->GetClassName() );
wxPrintf( T(".\n") );
wxPrintf( wxT(".\n") );
*/
wxEventType event_type = wxEVT_LEFT_DOWN;
@@ -1809,7 +1809,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( T("wxWindow creation failed") );
wxFAIL_MSG( wxT("wxWindow creation failed") );
return FALSE;
}
@@ -1819,14 +1819,14 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
#ifdef __WXDEBUG__
debug_focus_in( m_widget, T("wxWindow::m_widget"), name );
debug_focus_in( m_widget, wxT("wxWindow::m_widget"), name );
#endif
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
#ifdef __WXDEBUG__
debug_focus_in( scrolledWindow->hscrollbar, T("wxWindow::hsrcollbar"), name );
debug_focus_in( scrolledWindow->vscrollbar, T("wxWindow::vsrcollbar"), name );
debug_focus_in( scrolledWindow->hscrollbar, wxT("wxWindow::hsrcollbar"), name );
debug_focus_in( scrolledWindow->vscrollbar, wxT("wxWindow::vsrcollbar"), name );
#endif
GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
@@ -1840,7 +1840,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
m_wxwindow = gtk_myfixed_new();
#ifdef __WXDEBUG__
debug_focus_in( m_wxwindow, T("wxWindow::m_wxwindow"), name );
debug_focus_in( m_wxwindow, wxT("wxWindow::m_wxwindow"), name );
#endif
gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
@@ -1998,7 +1998,7 @@ wxWindow::~wxWindow()
bool wxWindow::PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize &size )
{
wxCHECK_MSG( !m_needParent || parent, FALSE, T("Need complete parent.") );
wxCHECK_MSG( !m_needParent || parent, FALSE, wxT("Need complete parent.") );
/* this turns -1 into 20 so that a minimal window is
visible even although -1,-1 has been given as the
@@ -2030,7 +2030,7 @@ bool wxWindow::PreCreation( wxWindow *parent, const wxPoint &pos, const wxSize
void wxWindow::PostCreation()
{
wxASSERT_MSG( (m_widget != NULL), T("invalid window") );
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
if (m_wxwindow)
{
@@ -2095,7 +2095,7 @@ void wxWindow::ConnectWidget( GtkWidget *widget )
bool wxWindow::Destroy()
{
wxASSERT_MSG( (m_widget != NULL), T("invalid window") );
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
m_hasVMT = FALSE;
@@ -2104,8 +2104,8 @@ bool wxWindow::Destroy()
void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), T("invalid window") );
wxASSERT_MSG( (m_parent != NULL), T("wxWindow::SetSize requires parent.\n") );
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
wxASSERT_MSG( (m_parent != NULL), wxT("wxWindow::SetSize requires parent.\n") );
if (m_resizing) return; /* I don't like recursions */
m_resizing = TRUE;
@@ -2239,7 +2239,7 @@ void wxWindow::OnInternalIdle()
void wxWindow::DoGetSize( int *width, int *height ) const
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (width) (*width) = m_width;
if (height) (*height) = m_height;
@@ -2247,7 +2247,7 @@ void wxWindow::DoGetSize( int *width, int *height ) const
void wxWindow::DoSetClientSize( int width, int height )
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_wxwindow)
{
@@ -2321,7 +2321,7 @@ void wxWindow::DoSetClientSize( int width, int height )
void wxWindow::DoGetClientSize( int *width, int *height ) const
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_wxwindow)
{
@@ -2396,7 +2396,7 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
void wxWindow::DoGetPosition( int *x, int *y ) const
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (x) (*x) = m_x;
if (y) (*y) = m_y;
@@ -2404,7 +2404,7 @@ void wxWindow::DoGetPosition( int *x, int *y ) const
void wxWindow::DoClientToScreen( int *x, int *y ) const
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_widget->window) return;
@@ -2433,7 +2433,7 @@ void wxWindow::DoClientToScreen( int *x, int *y ) const
void wxWindow::DoScreenToClient( int *x, int *y ) const
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_widget->window) return;
@@ -2462,7 +2462,7 @@ void wxWindow::DoScreenToClient( int *x, int *y ) const
bool wxWindow::Show( bool show )
{
wxCHECK_MSG( (m_widget != NULL), FALSE, T("invalid window") );
wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
if (!wxWindowBase::Show(show))
{
@@ -2480,7 +2480,7 @@ bool wxWindow::Show( bool show )
bool wxWindow::Enable( bool enable )
{
wxCHECK_MSG( (m_widget != NULL), FALSE, T("invalid window") );
wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
if (!wxWindowBase::Enable(enable))
{
@@ -2497,9 +2497,9 @@ bool wxWindow::Enable( bool enable )
int wxWindow::GetCharHeight() const
{
wxCHECK_MSG( (m_widget != NULL), 12, T("invalid window") );
wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
wxCHECK_MSG( m_font.Ok(), 12, T("invalid font") );
wxCHECK_MSG( m_font.Ok(), 12, wxT("invalid font") );
GdkFont *font = m_font.GetInternalFont( 1.0 );
@@ -2508,9 +2508,9 @@ int wxWindow::GetCharHeight() const
int wxWindow::GetCharWidth() const
{
wxCHECK_MSG( (m_widget != NULL), 8, T("invalid window") );
wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
wxCHECK_MSG( m_font.Ok(), 8, T("invalid font") );
wxCHECK_MSG( m_font.Ok(), 8, wxT("invalid font") );
GdkFont *font = m_font.GetInternalFont( 1.0 );
@@ -2527,7 +2527,7 @@ void wxWindow::GetTextExtent( const wxString& string,
wxFont fontToUse = m_font;
if (theFont) fontToUse = *theFont;
wxCHECK_RET( fontToUse.Ok(), T("invalid font") );
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
GdkFont *font = fontToUse.GetInternalFont( 1.0 );
if (x) (*x) = gdk_string_width( font, string.mbc_str() );
@@ -2538,7 +2538,7 @@ void wxWindow::GetTextExtent( const wxString& string,
void wxWindow::SetFocus()
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget)
@@ -2564,7 +2564,7 @@ bool wxWindow::AcceptsFocus() const
bool wxWindow::Reparent( wxWindowBase *newParentBase )
{
wxCHECK_MSG( (m_widget != NULL), FALSE, T("invalid window") );
wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
wxWindow *oldParent = m_parent,
*newParent = (wxWindow *)newParentBase;
@@ -2600,11 +2600,11 @@ bool wxWindow::Reparent( wxWindowBase *newParentBase )
void wxWindow::DoAddChild(wxWindow *child)
{
wxASSERT_MSG( (m_widget != NULL), T("invalid window") );
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
wxASSERT_MSG( (child != NULL), T("invalid child window") );
wxASSERT_MSG( (child != NULL), wxT("invalid child window") );
wxASSERT_MSG( (m_insertCallback != NULL), T("invalid child insertion function") );
wxASSERT_MSG( (m_insertCallback != NULL), wxT("invalid child insertion function") );
/* add to list */
AddChild( child );
@@ -2615,7 +2615,7 @@ void wxWindow::DoAddChild(wxWindow *child)
void wxWindow::Raise()
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_widget->window) return;
@@ -2624,7 +2624,7 @@ void wxWindow::Raise()
void wxWindow::Lower()
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_widget->window) return;
@@ -2633,14 +2633,14 @@ void wxWindow::Lower()
bool wxWindow::SetCursor( const wxCursor &cursor )
{
wxCHECK_MSG( (m_widget != NULL), FALSE, T("invalid window") );
wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
return wxWindowBase::SetCursor( cursor );
}
void wxWindow::WarpPointer( int x, int y )
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
GtkWidget *connect_widget = GetConnectWidget();
if (connect_widget->window)
@@ -2653,7 +2653,7 @@ void wxWindow::WarpPointer( int x, int y )
void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
{
wxCHECK_RET( (m_widget != NULL), T("invalid window") );
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (!m_widget->window) return;
@@ -2720,7 +2720,7 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
void wxWindow::Clear()
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
if (!m_widget->window) return;
@@ -2747,7 +2747,7 @@ void wxWindow::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
bool wxWindow::SetBackgroundColour( const wxColour &colour )
{
wxCHECK_MSG( m_widget != NULL, FALSE, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
if (!wxWindowBase::SetBackgroundColour(colour))
{
@@ -2794,7 +2794,7 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
bool wxWindow::SetForegroundColour( const wxColour &colour )
{
wxCHECK_MSG( m_widget != NULL, FALSE, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
if (!wxWindowBase::SetForegroundColour(colour))
{
@@ -2910,9 +2910,9 @@ static void pop_pos_callback( GtkMenu * WXUNUSED(menu),
bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y )
{
wxCHECK_MSG( m_widget != NULL, FALSE, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
wxCHECK_MSG( menu != NULL, FALSE, T("invalid popup-menu") );
wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
SetInvokingWindow( menu, this );
@@ -2949,7 +2949,7 @@ bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y )
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
GtkWidget *dnd_widget = GetConnectWidget();
@@ -2979,7 +2979,7 @@ bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
bool wxWindow::SetFont( const wxFont &font )
{
wxCHECK_MSG( m_widget != NULL, FALSE, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
if (!wxWindowBase::SetFont(font))
{
@@ -3017,9 +3017,9 @@ bool wxWindow::SetFont( const wxFont &font )
void wxWindow::CaptureMouse()
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( g_captureWindow == NULL, T("CaptureMouse called twice") );
wxCHECK_RET( g_captureWindow == NULL, wxT("CaptureMouse called twice") );
GtkWidget *connect_widget = GetConnectWidget();
if (!connect_widget->window) return;
@@ -3038,9 +3038,9 @@ void wxWindow::CaptureMouse()
void wxWindow::ReleaseMouse()
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( g_captureWindow, T("ReleaseMouse called twice") );
wxCHECK_RET( g_captureWindow, wxT("ReleaseMouse called twice") );
GtkWidget *connect_widget = GetConnectWidget();
if (!connect_widget->window) return;
@@ -3057,9 +3057,9 @@ bool wxWindow::IsRetained() const
void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh )
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( m_wxwindow != NULL, T("window needs client area for scrolling") );
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
m_hasScrolling = TRUE;
@@ -3120,9 +3120,9 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( m_wxwindow != NULL, T("window needs client area for scrolling") );
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
if (orient == wxHORIZONTAL)
{
@@ -3163,9 +3163,9 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
int wxWindow::GetScrollThumb( int orient ) const
{
wxCHECK_MSG( m_widget != NULL, 0, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
wxCHECK_MSG( m_wxwindow != NULL, 0, T("window needs client area for scrolling") );
wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
if (orient == wxHORIZONTAL)
return (int)(m_hAdjust->page_size+0.5);
@@ -3175,9 +3175,9 @@ int wxWindow::GetScrollThumb( int orient ) const
int wxWindow::GetScrollPos( int orient ) const
{
wxCHECK_MSG( m_widget != NULL, 0, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
wxCHECK_MSG( m_wxwindow != NULL, 0, T("window needs client area for scrolling") );
wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
if (orient == wxHORIZONTAL)
return (int)(m_hAdjust->value+0.5);
@@ -3187,9 +3187,9 @@ int wxWindow::GetScrollPos( int orient ) const
int wxWindow::GetScrollRange( int orient ) const
{
wxCHECK_MSG( m_widget != NULL, 0, T("invalid window") );
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
wxCHECK_MSG( m_wxwindow != NULL, 0, T("window needs client area for scrolling") );
wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
if (orient == wxHORIZONTAL)
return (int)(m_hAdjust->upper+0.5);
@@ -3199,9 +3199,9 @@ int wxWindow::GetScrollRange( int orient ) const
void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
{
wxCHECK_RET( m_widget != NULL, T("invalid window") );
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
wxCHECK_RET( m_wxwindow != NULL, T("window needs client area for scrolling") );
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
if (!m_scrollGC)
{