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

Changed wxRootWindow from a global to a staic variable with an

Browse Source 
accessor function that initializes if on first use.  This prevents
core dumps for apps that try to create wxBitmaps before the wxApp
object is initialized.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2001-05-11 17:55:28 +00:00
parent a90c95aa8e
commit c2fa61e833
12 changed files with 234 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/app.cpp
View File

@ -52,7 +52,7 @@ extern bool g_isIdle;
bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0;
GtkWidget *wxRootWindow = (GtkWidget*) NULL;
static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
//-----------------------------------------------------------------------------
// local functions
@ -626,6 +626,19 @@ void wxApp::CleanUp()
#endif // wxUSE_LOG
}
//-----------------------------------------------------------------------------
// Access to the root window global
//-----------------------------------------------------------------------------
GtkWidget* wxGetRootWindow()
{
if (gs_RootWindow == NULL) {
gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_realize( gs_RootWindow );
}
return gs_RootWindow;
}
//-----------------------------------------------------------------------------
// wxEntry
//-----------------------------------------------------------------------------
@ -676,6 +689,7 @@ int wxEntryStart( int argc, char *argv[] )
return 0;
}
int wxEntryInitGui()
{
int retValue = 0;
@ -683,8 +697,7 @@ int wxEntryInitGui()
if ( !wxTheApp->OnInitGui() )
retValue = -1;
wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_realize( wxRootWindow );
wxGetRootWindow();
return retValue;
}

41
src/gtk/bitmap.cpp
View File

@ -40,7 +40,7 @@ extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
// data
//-----------------------------------------------------------------------------
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// wxMask
@ -89,7 +89,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
wxImage image( bitmap );
if (!image.Ok()) return FALSE;
m_bitmap = gdk_pixmap_new( wxRootWindow->window, image.GetWidth(), image.GetHeight(), 1 );
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
GdkGC *gc = gdk_gc_new( m_bitmap );
GdkColor color;
@ -108,7 +108,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
unsigned char green = colour.Green();
unsigned char blue = colour.Blue();
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
int bpp = visual->depth;
@ -188,7 +188,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
m_bitmap = gdk_pixmap_new( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
if (!m_bitmap) return FALSE;
@ -268,7 +268,7 @@ bool wxBitmap::Create( int width, int height, int depth )
wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
if (depth == -1) depth = visual->depth;
@ -282,12 +282,12 @@ bool wxBitmap::Create( int width, int height, int depth )
M_BMPDATA->m_height = height;
if (depth == 1)
{
M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
M_BMPDATA->m_bpp = 1;
}
else
{
M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
M_BMPDATA->m_bpp = visual->depth;
}
@ -298,14 +298,14 @@ bool wxBitmap::CreateFromXpm( const char **bits )
{
wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
m_refData = new wxBitmapRefData();
GdkBitmap *mask = (GdkBitmap*) NULL;
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, (gchar **) bits );
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );
wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
@ -324,7 +324,6 @@ bool wxBitmap::CreateFromXpm( const char **bits )
return TRUE;
}
extern GtkWidget *wxRootWindow;
bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
{
@ -346,11 +345,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
SetHeight( height );
SetWidth( width );
SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) );
SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
SetDepth( 1 );
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
// Create picture image
@ -371,7 +370,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
wxMask *mask = new wxMask();
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
SetMask( mask );
}
@ -443,11 +442,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
SetHeight( height );
SetWidth( width );
SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
// Retrieve depth
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
int bpp = visual->depth;
@ -501,7 +500,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
wxMask *mask = new wxMask();
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
SetMask( mask );
}
@ -691,7 +690,7 @@ wxImage wxBitmap::ConvertToImage() const
{
GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window );
if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->window );
bpp = visual->depth;
if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
red_shift_right = visual->red_shift;
@ -790,7 +789,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_bitmap =
gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
M_BMPDATA->m_width = width;
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
@ -890,7 +889,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
if (GetMask())
{
wxMask *mask = new wxMask;
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, rect.width, rect.height, 1 );
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
GdkGC *gc = gdk_gc_new( mask->m_bitmap );
gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
@ -921,7 +920,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
if (!wxFileExists(name)) return FALSE;
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
if (type == wxBITMAP_TYPE_XPM)
@ -930,7 +929,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
GdkBitmap *mask = (GdkBitmap*) NULL;
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() );
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() );
if (mask)
{

6
src/gtk/cursor.cpp
View File

@ -110,7 +110,7 @@ wxCursor::wxCursor( int cursorId )
M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
}
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
wxCursor::wxCursor(const char bits[], int width, int height,
int hotSpotX, int hotSpotY,
@ -127,8 +127,8 @@ wxCursor::wxCursor(const char bits[], int width, int height,
if (hotSpotY < 0 || hotSpotY >= height)
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) maskBits, width, height);
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, width, height);
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(

6
src/gtk/dcclient.cpp
View File

@ -54,7 +54,7 @@
static GdkPixmap *hatches[num_hatches];
static GdkPixmap **hatch_bitmap = (GdkPixmap **) NULL;
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// constants
@ -1021,7 +1021,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
if (!m_currentClippingRegion.IsNull())
{
GdkColor col;
new_mask = gdk_pixmap_new( wxRootWindow->window, ww, hh, 1 );
new_mask = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, 1 );
GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0;
gdk_gc_set_foreground( gc, &col );
@ -1206,7 +1206,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
if (!m_currentClippingRegion.IsNull())
{
GdkColor col;
new_mask = gdk_pixmap_new( wxRootWindow->window, bm_ww, bm_hh, 1 );
new_mask = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, 1 );
GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0;
gdk_gc_set_foreground( gc, &col );

4
src/gtk/minifram.cpp
View File

@ -37,7 +37,7 @@ extern bool g_isIdle;
extern bool g_blockEventsOnDrag;
extern bool g_blockEventsOnScroll;
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// local functions
@ -321,7 +321,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
{
GdkBitmap *mask = (GdkBitmap*) NULL;
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, cross_xpm );
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, cross_xpm );
GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
gdk_bitmap_unref( mask );

4
src/gtk/utilsgtk.cpp
View File

@ -46,7 +46,7 @@
// data
//-----------------------------------------------------------------------------
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//----------------------------------------------------------------------------
// misc.
@ -117,7 +117,7 @@ bool wxColourDisplay()
int wxDisplayDepth()
{
return gdk_window_get_visual( wxRootWindow->window )->depth;
return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
}
int wxGetOsVersion(int *majorVsn, int *minorVsn)

19
src/gtk1/app.cpp
View File

@ -52,7 +52,7 @@ extern bool g_isIdle;
bool g_mainThreadLocked = FALSE;
gint g_pendingTag = 0;
GtkWidget *wxRootWindow = (GtkWidget*) NULL;
static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
//-----------------------------------------------------------------------------
// local functions
@ -626,6 +626,19 @@ void wxApp::CleanUp()
#endif // wxUSE_LOG
}
//-----------------------------------------------------------------------------
// Access to the root window global
//-----------------------------------------------------------------------------
GtkWidget* wxGetRootWindow()
{
if (gs_RootWindow == NULL) {
gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_realize( gs_RootWindow );
}
return gs_RootWindow;
}
//-----------------------------------------------------------------------------
// wxEntry
//-----------------------------------------------------------------------------
@ -676,6 +689,7 @@ int wxEntryStart( int argc, char *argv[] )
return 0;
}
int wxEntryInitGui()
{
int retValue = 0;
@ -683,8 +697,7 @@ int wxEntryInitGui()
if ( !wxTheApp->OnInitGui() )
retValue = -1;
wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_widget_realize( wxRootWindow );
wxGetRootWindow();
return retValue;
}

41
src/gtk1/bitmap.cpp
View File

@ -40,7 +40,7 @@ extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
// data
//-----------------------------------------------------------------------------
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// wxMask
@ -89,7 +89,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
wxImage image( bitmap );
if (!image.Ok()) return FALSE;
m_bitmap = gdk_pixmap_new( wxRootWindow->window, image.GetWidth(), image.GetHeight(), 1 );
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
GdkGC *gc = gdk_gc_new( m_bitmap );
GdkColor color;
@ -108,7 +108,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
unsigned char green = colour.Green();
unsigned char blue = colour.Blue();
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
int bpp = visual->depth;
@ -188,7 +188,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
m_bitmap = gdk_pixmap_new( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
if (!m_bitmap) return FALSE;
@ -268,7 +268,7 @@ bool wxBitmap::Create( int width, int height, int depth )
wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
if (depth == -1) depth = visual->depth;
@ -282,12 +282,12 @@ bool wxBitmap::Create( int width, int height, int depth )
M_BMPDATA->m_height = height;
if (depth == 1)
{
M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
M_BMPDATA->m_bpp = 1;
}
else
{
M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );
M_BMPDATA->m_bpp = visual->depth;
}
@ -298,14 +298,14 @@ bool wxBitmap::CreateFromXpm( const char **bits )
{
wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
m_refData = new wxBitmapRefData();
GdkBitmap *mask = (GdkBitmap*) NULL;
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, (gchar **) bits );
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );
wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
@ -324,7 +324,6 @@ bool wxBitmap::CreateFromXpm( const char **bits )
return TRUE;
}
extern GtkWidget *wxRootWindow;
bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
{
@ -346,11 +345,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
SetHeight( height );
SetWidth( width );
SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) );
SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
SetDepth( 1 );
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
// Create picture image
@ -371,7 +370,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
wxMask *mask = new wxMask();
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
SetMask( mask );
}
@ -443,11 +442,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
SetHeight( height );
SetWidth( width );
SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );
// Retrieve depth
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
int bpp = visual->depth;
@ -501,7 +500,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
mask_image = gdk_image_new_bitmap( visual, mask_data, width, height );
wxMask *mask = new wxMask();
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );
SetMask( mask );
}
@ -691,7 +690,7 @@ wxImage wxBitmap::ConvertToImage() const
{
GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window );
if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->window );
bpp = visual->depth;
if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
red_shift_right = visual->red_shift;
@ -790,7 +789,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
M_BMPDATA->m_mask = (wxMask *) NULL;
M_BMPDATA->m_bitmap =
gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
M_BMPDATA->m_width = width;
M_BMPDATA->m_height = height;
M_BMPDATA->m_bpp = 1;
@ -890,7 +889,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
if (GetMask())
{
wxMask *mask = new wxMask;
mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, rect.width, rect.height, 1 );
mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
GdkGC *gc = gdk_gc_new( mask->m_bitmap );
gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
@ -921,7 +920,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
if (!wxFileExists(name)) return FALSE;
GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual );
if (type == wxBITMAP_TYPE_XPM)
@ -930,7 +929,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
GdkBitmap *mask = (GdkBitmap*) NULL;
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() );
M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() );
if (mask)
{

6
src/gtk1/cursor.cpp
View File

@ -110,7 +110,7 @@ wxCursor::wxCursor( int cursorId )
M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
}
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
wxCursor::wxCursor(const char bits[], int width, int height,
int hotSpotX, int hotSpotY,
@ -127,8 +127,8 @@ wxCursor::wxCursor(const char bits[], int width, int height,
if (hotSpotY < 0 || hotSpotY >= height)
hotSpotY = 0;
GdkBitmap *data = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) maskBits, width, height);
GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );
GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, width, height);
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(

6
src/gtk1/dcclient.cpp
View File

@ -54,7 +54,7 @@
static GdkPixmap *hatches[num_hatches];
static GdkPixmap **hatch_bitmap = (GdkPixmap **) NULL;
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// constants
@ -1021,7 +1021,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
if (!m_currentClippingRegion.IsNull())
{
GdkColor col;
new_mask = gdk_pixmap_new( wxRootWindow->window, ww, hh, 1 );
new_mask = gdk_pixmap_new( wxGetRootWindow()->window, ww, hh, 1 );
GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0;
gdk_gc_set_foreground( gc, &col );
@ -1206,7 +1206,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
if (!m_currentClippingRegion.IsNull())
{
GdkColor col;
new_mask = gdk_pixmap_new( wxRootWindow->window, bm_ww, bm_hh, 1 );
new_mask = gdk_pixmap_new( wxGetRootWindow()->window, bm_ww, bm_hh, 1 );
GdkGC *gc = gdk_gc_new( new_mask );
col.pixel = 0;
gdk_gc_set_foreground( gc, &col );

4
src/gtk1/minifram.cpp
View File

@ -37,7 +37,7 @@ extern bool g_isIdle;
extern bool g_blockEventsOnDrag;
extern bool g_blockEventsOnScroll;
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//-----------------------------------------------------------------------------
// local functions
@ -321,7 +321,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
{
GdkBitmap *mask = (GdkBitmap*) NULL;
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, cross_xpm );
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, cross_xpm );
GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
gdk_bitmap_unref( mask );

4
src/gtk1/utilsgtk.cpp
View File

@ -46,7 +46,7 @@
// data
//-----------------------------------------------------------------------------
extern GtkWidget *wxRootWindow;
extern GtkWidget *wxGetRootWindow();
//----------------------------------------------------------------------------
// misc.
@ -117,7 +117,7 @@ bool wxColourDisplay()
int wxDisplayDepth()
{
return gdk_window_get_visual( wxRootWindow->window )->depth;
return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
}
int wxGetOsVersion(int *majorVsn, int *minorVsn)