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

stream compile fixes

Browse Source 
bitmap, icon, imaglist work (broken)
notebook client resize fixed (ugly)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-07-12 20:06:59 +00:00
parent 3cacae09fa
commit 219f895a27
25 changed files with 433 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/gtk1/bitmap.cpp
View File

@@ -74,6 +74,9 @@ class wxBitmapRefData: public wxObjectRefData
int m_width;
int m_height;
int m_bpp;
#ifdef USE_GDK_IMLIB
GdkImlibImage *m_image;
#endif
wxPalette *m_palette;
};
@@ -92,10 +95,11 @@ wxBitmapRefData::~wxBitmapRefData(void)
{
#ifdef USE_GDK_IMLIB
if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
if (m_image) gdk_imlib_destroy_image( m_image );
#else
if (m_pixmap) gdk_pixmap_unref( m_pixmap );
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
#endif
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
if (m_mask) delete m_mask;
if (m_palette) delete m_palette;
};
@@ -126,22 +130,26 @@ wxBitmap::wxBitmap( int width, int height, int depth )
wxBitmap::wxBitmap( char **bits )
{
m_refData = new wxBitmapRefData();
GdkBitmap *mask = NULL;
#ifndef USE_GDK_IMLIB
GdkBitmap *mask = NULL;
M_BMPDATA->m_pixmap =
gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
#else
M_BMPDATA->m_pixmap = NULL;
int res = gdk_imlib_data_to_pixmap( bits, &M_BMPDATA->m_pixmap, &mask );
#endif
if (mask)
{
M_BMPDATA->m_mask = new wxMask();
M_BMPDATA->m_mask->m_bitmap = mask;
};
#else
M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
Render();
#endif
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = 24; // ?
@@ -248,19 +256,57 @@ void wxBitmap::SetDepth( int depth )
wxMask *wxBitmap::GetMask(void) const
{
if (!Ok()) return NULL;
return M_BMPDATA->m_mask;
};
void wxBitmap::SetMask( wxMask *mask )
{
if (!Ok()) return;
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
M_BMPDATA->m_mask = mask;
};
bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), int WXUNUSED(type),
void wxBitmap::Resize( int height, int width )
{
if (!Ok()) return;
return;
#ifdef USE_GDK_IMLIB
if (M_BMPDATA->m_bitmap) return; // not supported for bitmaps
if (!M_BMPDATA->m_image) RecreateImage();
if (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
GdkImlibImage* image = gdk_imlib_clone_scaled_image( M_BMPDATA->m_image, height, width );
gdk_imlib_destroy_image( M_BMPDATA->m_image );
M_BMPDATA->m_image = image;
M_BMPDATA->m_height = height;
M_BMPDATA->m_width = width;
Render();
#endif
};
bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
wxPalette *WXUNUSED(palette) )
{
#ifdef USE_GDK_IMLIB
if (!Ok()) return FALSE;
if (!M_BMPDATA->m_image) RecreateImage();
return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, NULL );
#endif
return FALSE;
};
@@ -270,23 +316,16 @@ bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
UnRef();
m_refData = new wxBitmapRefData();
M_BMPDATA->m_mask = NULL;
GdkBitmap *mask = NULL;
int res = gdk_imlib_load_file_to_pixmap( WXSTRINGCAST name, &M_BMPDATA->m_pixmap, &mask );
M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
if (res != 1)
if (!M_BMPDATA->m_image)
{
UnRef();
return FALSE;
};
if (mask)
{
M_BMPDATA->m_mask = new wxMask();
M_BMPDATA->m_mask->m_bitmap = mask;
}
Render();
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = 24; // ?
@@ -312,6 +351,42 @@ GdkPixmap *wxBitmap::GetPixmap(void) const
GdkBitmap *wxBitmap::GetBitmap(void) const
{
if (!Ok()) return NULL;
return M_BMPDATA->m_bitmap;
};
void wxBitmap::DestroyImage(void)
{
if (!Ok()) return;
if (M_BMPDATA->m_image)
{
gdk_imlib_destroy_image( M_BMPDATA->m_image );
M_BMPDATA->m_image = NULL;
};
};
void wxBitmap::RecreateImage(void)
{
};
void wxBitmap::Render(void)
{
if (!Ok()) return;
#ifdef USE_GDK_IMLIB
gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
M_BMPDATA->m_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
if (mask)
{
M_BMPDATA->m_mask = new wxMask();
M_BMPDATA->m_mask->m_bitmap = mask;
};
#endif
};

7
src/gtk1/frame.cpp
View File

@@ -42,7 +42,7 @@ void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc,
printf( ".\n" );
*/
win->GtkOnSize( alloc->width, alloc->height );
win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
};
//-----------------------------------------------------------------------------
@@ -194,8 +194,11 @@ void wxFrame::GetClientSize( int *width, int *height ) const
};
};
void wxFrame::GtkOnSize( int width, int height )
void wxFrame::GtkOnSize( int x, int y, int width, int height )
{
m_x = x;
m_y = y;
if ((m_height == height) && (m_width == width) &&
(m_sizeSet)) return;
if (!m_mainWindow) return;

5
src/gtk1/icon.cpp
View File

@@ -20,3 +20,8 @@
IMPLEMENT_DYNAMIC_CLASS(wxIcon,wxBitmap)
wxIcon::wxIcon( char **bits, int WXUNUSED(width), int WXUNUSED(height) ) :
wxBitmap( bits )
{
};

115
src/gtk1/notebook.cpp
View File

@@ -19,13 +19,40 @@
#include "wx/intl.h"
#include "wx/log.h"
//-----------------------------------------------------------------------------
// wxNotebookPage
//-----------------------------------------------------------------------------
class wxNotebookPage: public wxObject
{
public:
wxNotebookPage()
{
m_id = -1;
m_text = "";
m_image = -1;
m_page = NULL;
m_client = NULL;
m_parent = NULL;
};
//private:
int m_id;
wxString m_text;
int m_image;
GtkNotebookPage *m_page;
GtkLabel *m_label;
wxWindow *m_client;
GtkNotebook *m_parent;
};
//-----------------------------------------------------------------------------
// GTK callbacks
//-----------------------------------------------------------------------------
// page change callback
static void gtk_notebook_page_change_callback(GtkNotebook *widget,
GtkNotebookPage *page,
static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
GtkNotebookPage *WXUNUSED(page),
gint nPage,
gpointer data)
{
@@ -42,29 +69,24 @@ static void gtk_notebook_page_change_callback(GtkNotebook *widget,
notebook->ProcessEvent(event);
}
//-----------------------------------------------------------------------------
// wxNotebookPage
//-----------------------------------------------------------------------------
class wxNotebookPage: public wxObject
static void gtk_notebook_client_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc,
wxNotebookPage *page )
{
public:
wxNotebookPage()
{
m_id = -1;
m_text = "";
m_image = -1;
m_page = NULL;
m_clientPanel = NULL;
};
if (!page->m_client->HasVMT()) return;
//private:
int m_id;
wxString m_text;
int m_image;
GtkNotebookPage *m_page;
GtkLabel *m_label;
wxWindow *m_clientPanel;
/*
printf( "OnResize from " );
if (page->m_client->GetClassInfo() && page->m_client->GetClassInfo()->GetClassName())
printf( page->m_client->GetClassInfo()->GetClassName() );
printf( ".\n" );
printf( " New: X: %d Y: %d ", alloc->x, alloc->y );
printf( " W: %d H: %d ", alloc->width, alloc->height );
printf( " .\n" );
*/
page->m_client->SetSize( alloc->x, alloc->y+26,
alloc->width, alloc->height );
};
//-----------------------------------------------------------------------------
@@ -195,7 +217,7 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
node = node->Next();
};
wxLogDebug("Notebook page %d not found!", page);
wxLogDebug( "Notebook page %d not found!", page );
return NULL;
};
@@ -305,7 +327,7 @@ bool wxNotebook::DeletePage( int page )
wxASSERT( child );
delete nb_page->m_clientPanel;
delete nb_page->m_client;
// Amazingly, this is not necessary
// gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
@@ -328,7 +350,7 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
while (node)
{
page = (wxNotebookPage*)node->Data();
if ( page->m_clientPanel == win )
if ( page->m_client == win )
break; // found
node = node->Next();
};
@@ -356,29 +378,36 @@ wxWindow *wxNotebook::GetPage( int page ) const
if (!nb_page)
return NULL;
else
return nb_page->m_clientPanel;
return nb_page->m_client;
};
void wxNotebook::AddChild( wxWindow *win )
{
// @@@ normally done in wxWindow::AddChild but for some reason wxNotebook
// case is special there (Robert?)
// Robert: Don't you think the code below looks different from the one
// in wxWindow::AddChild :-)
m_children.Append(win);
wxNotebookPage *page = new wxNotebookPage();
page->m_id = GetPageCount();
page->m_label = (GtkLabel *)gtk_label_new("no caption");
page->m_clientPanel = win;
gtk_notebook_append_page(GTK_NOTEBOOK(m_widget), win->m_widget,
(GtkWidget *)page->m_label);
page->m_label = (GtkLabel *)gtk_label_new("Handle");
page->m_client = win;
gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget,
(GtkWidget *)page->m_label);
gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
page->m_page = (GtkNotebookPage*)
(
g_list_last(GTK_NOTEBOOK(m_widget)->children)->data
);
page->m_page =
(GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
page->m_parent = GTK_NOTEBOOK(m_widget);
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_notebook_client_size_callback), (gpointer)page );
if (!page->m_page)
{
wxLogFatalError( "Notebook page creation error" );
@@ -388,22 +417,6 @@ void wxNotebook::AddChild( wxWindow *win )
m_pages.Append( page );
};
void wxNotebook::OnSize(wxSizeEvent& event)
{
// forward this event to all pages
wxNode *node = m_pages.First();
while (node)
{
wxNotebookPage *page = (wxNotebookPage*)node->Data();
// @@@@ This -50 is completely wrong - instead, we should substract
// the height of the tabs
page->m_clientPanel->SetSize(event.GetSize().GetX(),
event.GetSize().GetY() - 50);
node = node->Next();
};
}
//-----------------------------------------------------------------------------
// wxNotebookEvent
//-----------------------------------------------------------------------------