From 80a58c9968cc740b50fb92cd95d6a014a1c6e9bf Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 11 Feb 2000 12:28:21 +0000 Subject: [PATCH] Added BMP files for wxPlotWindow, Replaced wxWindow with wxNotebookPage in wxNotebook. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/notebook.h | 31 ++++++++++++++---------- include/wx/gtk1/notebook.h | 31 ++++++++++++++---------- include/wx/msw/plot_dwn.bmp | Bin 0 -> 1342 bytes include/wx/msw/plot_enl.bmp | Bin 0 -> 1416 bytes include/wx/msw/plot_shr.bmp | Bin 0 -> 1414 bytes include/wx/msw/plot_up.bmp | Bin 0 -> 1342 bytes include/wx/msw/plot_zin.bmp | Bin 0 -> 1424 bytes include/wx/msw/plot_zot.bmp | Bin 0 -> 1420 bytes include/wx/msw/wx.rc | 7 ++++++ samples/controls/controls.cpp | 2 +- src/gtk/notebook.cpp | 44 +++++++++++++++++----------------- src/gtk1/notebook.cpp | 44 +++++++++++++++++----------------- 12 files changed, 90 insertions(+), 69 deletions(-) create mode 100644 include/wx/msw/plot_dwn.bmp create mode 100644 include/wx/msw/plot_enl.bmp create mode 100644 include/wx/msw/plot_shr.bmp create mode 100644 include/wx/msw/plot_up.bmp create mode 100644 include/wx/msw/plot_zin.bmp create mode 100644 include/wx/msw/plot_zot.bmp diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h index 45039a0bd7..9106055672 100644 --- a/include/wx/gtk/notebook.h +++ b/include/wx/gtk/notebook.h @@ -29,7 +29,14 @@ class wxImageList; class wxNotebook; -class wxNotebookPage; + +typedef wxWindow wxNotebookPage; // so far, any window can be a page + +//----------------------------------------------------------------------------- +// internal class +//----------------------------------------------------------------------------- + +class wxGtkNotebookPage; //----------------------------------------------------------------------------- // wxNotebook @@ -112,19 +119,19 @@ public: // adds a new page to the notebook (it will be deleted ny the notebook, // don't delete it yourself). If bSelect, this page becomes active. - bool AddPage( wxWindow *win, - const wxString& strText, - bool select = FALSE, - int imageId = -1 ); + bool AddPage( wxNotebookPage *win, + const wxString& strText, + bool select = FALSE, + int imageId = -1 ); // the same as AddPage(), but adds it at the specified position - bool InsertPage( int position, - wxWindow *win, - const wxString& strText, - bool bSelect = FALSE, - int imageId = -1 ); + bool InsertPage( int position, + wxNotebookPage *win, + const wxString& strText, + bool bSelect = FALSE, + int imageId = -1 ); // get the panel which represents the given page - wxWindow *GetPage(int nPage) const; + wxNotebookPage *GetPage(int nPage) const; // handler for tab navigation // -------------------------- @@ -144,7 +151,7 @@ public: void Init(); // helper function - wxNotebookPage* GetNotebookPage(int page) const; + wxGtkNotebookPage* GetNotebookPage(int page) const; wxImageList* m_imageList; wxList m_pages; diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h index 45039a0bd7..9106055672 100644 --- a/include/wx/gtk1/notebook.h +++ b/include/wx/gtk1/notebook.h @@ -29,7 +29,14 @@ class wxImageList; class wxNotebook; -class wxNotebookPage; + +typedef wxWindow wxNotebookPage; // so far, any window can be a page + +//----------------------------------------------------------------------------- +// internal class +//----------------------------------------------------------------------------- + +class wxGtkNotebookPage; //----------------------------------------------------------------------------- // wxNotebook @@ -112,19 +119,19 @@ public: // adds a new page to the notebook (it will be deleted ny the notebook, // don't delete it yourself). If bSelect, this page becomes active. - bool AddPage( wxWindow *win, - const wxString& strText, - bool select = FALSE, - int imageId = -1 ); + bool AddPage( wxNotebookPage *win, + const wxString& strText, + bool select = FALSE, + int imageId = -1 ); // the same as AddPage(), but adds it at the specified position - bool InsertPage( int position, - wxWindow *win, - const wxString& strText, - bool bSelect = FALSE, - int imageId = -1 ); + bool InsertPage( int position, + wxNotebookPage *win, + const wxString& strText, + bool bSelect = FALSE, + int imageId = -1 ); // get the panel which represents the given page - wxWindow *GetPage(int nPage) const; + wxNotebookPage *GetPage(int nPage) const; // handler for tab navigation // -------------------------- @@ -144,7 +151,7 @@ public: void Init(); // helper function - wxNotebookPage* GetNotebookPage(int page) const; + wxGtkNotebookPage* GetNotebookPage(int page) const; wxImageList* m_imageList; wxList m_pages; diff --git a/include/wx/msw/plot_dwn.bmp b/include/wx/msw/plot_dwn.bmp new file mode 100644 index 0000000000000000000000000000000000000000..288ce644140442a980bb26ca78d95bfdf1e5a3a3 GIT binary patch literal 1342 zcmeH@%Mrpb3`Dh-tvJJh&!h+{;K+eHUAZ8t$SFOAl_Q`BCYo7W`@Gg9emw6*dfl?f zmEA;LC`hG5Dwo%=sRM_sMy=j(X|2gT&$29wtZS!!ve*6s`wRTx3rr@G3^>O=8nS{4 zU+Dp50y%Y-Fwm7w5Gl_%@sls>iS6bXxnvoK-{exG=e+_!8N%D<)tLq3d}g$>@?|Pe dm5&_qy&-D%hu+N8-WF68HcB literal 0 HcmV?d00001 diff --git a/include/wx/msw/plot_shr.bmp b/include/wx/msw/plot_shr.bmp new file mode 100644 index 0000000000000000000000000000000000000000..7223437b021b1fbbac4950b5c18559d9240b060b GIT binary patch literal 1414 zcmeH@%?-jZ42AuY*bPUd4#5Nrz#WO9BIaR=p1M9M_Bch*x`HGDkrN<=$^w|h5>C)nu5sco rFIE*T^U!s{68Ia!K3?n3wmM=w~^AMRJWs3CKN&{sISKi41WyV9~%sWT~2+A~H@25(SM-jO* zn}{0$sf0-7@fkLB!9_+RR!?}e)?}V%S(ZiCwX0q^;@H5kfj`{9WFpCcYuuxuWDvnC zIgsf>8F&;W|1@vdiQwa3HP+ap>z zmtc0LHxefT))QuTUeB(g5F&XpvB=?-bGB)kY@TOZmclBspM3-S2L5mZV={9II5s;Z z1P`LUd%gir1%fM_L&sMv44O(BF^asoqNtfe)43#JNQkj9@?n*eUF$M0y2i`a+5mf% u-g|cKX_d37$Qaw#M8$$XqNZE3HkCdye^vX|ohGbMbe#pscE!8oL0^@n p!Yg0A3AGLX)}#-KIDD-GX>%KVkAbwk~Xr;0H`)66yc| literal 0 HcmV?d00001 diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index b71f9a0b4c..f3da9b212c 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -138,3 +138,10 @@ wxDISABLE_BUTTON_BITMAP BITMAP "wx/msw/disable.bmp" tick_bmp BITMAP "wx/msw/tick.bmp" cross_bmp BITMAP "wx/msw/cross.bmp" +// For src/generic/plot.cpp +plot_up.bmp BITMAP "wx/msw/plot_up.bmp" +plot_dwn.bmp BITMAP "wx/msw/plot_dwn.bmp" +plot_enl.bmp BITMAP "wx/msw/plot_enl.bmp" +plot_shr.bmp BITMAP "wx/msw/plot_shr.bmp" +plot_zin.bmp BITMAP "wx/msw/plot_zin.bmp" +plot_zot.bmp BITMAP "wx/msw/plot_zot.bmp" diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 91d614bbbf..cb18539d48 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -632,7 +632,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20)); -#if 1 +#ifdef __WXMSW__ // test for masked bitmap display bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP); bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index 8d8cc9a639..2d4ed460a5 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -50,18 +50,18 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar #endif //----------------------------------------------------------------------------- -// wxNotebookPage +// wxGtkNotebookPage //----------------------------------------------------------------------------- -class wxNotebookPage: public wxObject +class wxGtkNotebookPage: public wxObject { public: - wxNotebookPage() + wxGtkNotebookPage() { m_text = ""; m_image = -1; m_page = (GtkNotebookPage *) NULL; - m_client = (wxWindow *) NULL; + m_client = (wxNotebookPage *) NULL; m_box = (GtkWidget *) NULL; } @@ -69,7 +69,7 @@ public: int m_image; GtkNotebookPage *m_page; GtkLabel *m_label; - wxWindow *m_client; + wxNotebookPage *m_client; GtkWidget *m_box; // in which the label and image are packed }; @@ -171,7 +171,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk wxNode *node = win->m_pages.Nth( win->GetSelection() ); if (!node) return FALSE; - wxNotebookPage *page = (wxNotebookPage*) node->Data(); + wxGtkNotebookPage *page = (wxGtkNotebookPage*) node->Data(); wxNavigationKeyEvent event; event.SetEventObject( win ); @@ -319,7 +319,7 @@ wxString wxNotebook::GetPageText( int page ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else @@ -330,22 +330,22 @@ int wxNotebook::GetPageImage( int page ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_image; else return -1; } -wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const +wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") ); + wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); wxNode *node = m_pages.Nth( page ); - return (wxNotebookPage *) node->Data(); + return (wxGtkNotebookPage *) node->Data(); } int wxNotebook::SetSelection( int page ) @@ -389,7 +389,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") ); @@ -404,7 +404,7 @@ bool wxNotebook::SetPageImage( int page, int image ) { /* HvdH 28-12-98: now it works, but it's a bit of a kludge */ - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -512,7 +512,7 @@ bool wxNotebook::DeleteAllPages() bool wxNotebook::DeletePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; /* GTK sets GtkNotebook.cur_page to NULL before sending @@ -529,7 +529,7 @@ bool wxNotebook::DeletePage( int page ) bool wxNotebook::RemovePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -540,7 +540,7 @@ bool wxNotebook::RemovePage( int page ) return TRUE; } -bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, +bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text, bool select, int imageId ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); @@ -554,7 +554,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxNotebookPage *page = new wxNotebookPage(); + wxGtkNotebookPage *page = new wxGtkNotebookPage(); if (position < 0) m_pages.Append( page ); @@ -622,7 +622,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, return TRUE; } -bool wxNotebook::AddPage(wxWindow* win, const wxString& text, +bool wxNotebook::AddPage(wxNotebookPage* win, const wxString& text, bool select, int imageId) { return InsertPage( -1, win, text, select, imageId ); @@ -636,13 +636,13 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.Skip(); } -wxWindow *wxNotebook::GetPage( int page ) const +wxNotebookPage *wxNotebook::GetPage( int page ) const { wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) - return (wxWindow *) NULL; + return (wxNotebookPage *) NULL; else return nb_page->m_client; } diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 8d8cc9a639..2d4ed460a5 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -50,18 +50,18 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar #endif //----------------------------------------------------------------------------- -// wxNotebookPage +// wxGtkNotebookPage //----------------------------------------------------------------------------- -class wxNotebookPage: public wxObject +class wxGtkNotebookPage: public wxObject { public: - wxNotebookPage() + wxGtkNotebookPage() { m_text = ""; m_image = -1; m_page = (GtkNotebookPage *) NULL; - m_client = (wxWindow *) NULL; + m_client = (wxNotebookPage *) NULL; m_box = (GtkWidget *) NULL; } @@ -69,7 +69,7 @@ public: int m_image; GtkNotebookPage *m_page; GtkLabel *m_label; - wxWindow *m_client; + wxNotebookPage *m_client; GtkWidget *m_box; // in which the label and image are packed }; @@ -171,7 +171,7 @@ static gint gtk_notebook_key_press_callback( GtkWidget *widget, GdkEventKey *gdk wxNode *node = win->m_pages.Nth( win->GetSelection() ); if (!node) return FALSE; - wxNotebookPage *page = (wxNotebookPage*) node->Data(); + wxGtkNotebookPage *page = (wxGtkNotebookPage*) node->Data(); wxNavigationKeyEvent event; event.SetEventObject( win ); @@ -319,7 +319,7 @@ wxString wxNotebook::GetPageText( int page ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_text; else @@ -330,22 +330,22 @@ int wxNotebook::GetPageImage( int page ) const { wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (nb_page) return nb_page->m_image; else return -1; } -wxNotebookPage* wxNotebook::GetNotebookPage( int page ) const +wxGtkNotebookPage* wxNotebook::GetNotebookPage( int page ) const { - wxCHECK_MSG( m_widget != NULL, (wxNotebookPage*) NULL, wxT("invalid notebook") ); + wxCHECK_MSG( m_widget != NULL, (wxGtkNotebookPage*) NULL, wxT("invalid notebook") ); - wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxNotebookPage*) NULL, wxT("invalid notebook index") ); + wxCHECK_MSG( page < (int)m_pages.GetCount(), (wxGtkNotebookPage*) NULL, wxT("invalid notebook index") ); wxNode *node = m_pages.Nth( page ); - return (wxNotebookPage *) node->Data(); + return (wxGtkNotebookPage *) node->Data(); } int wxNotebook::SetSelection( int page ) @@ -389,7 +389,7 @@ bool wxNotebook::SetPageText( int page, const wxString &text ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); wxCHECK_MSG( nb_page, FALSE, wxT("SetPageText: invalid page index") ); @@ -404,7 +404,7 @@ bool wxNotebook::SetPageImage( int page, int image ) { /* HvdH 28-12-98: now it works, but it's a bit of a kludge */ - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -512,7 +512,7 @@ bool wxNotebook::DeleteAllPages() bool wxNotebook::DeletePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; /* GTK sets GtkNotebook.cur_page to NULL before sending @@ -529,7 +529,7 @@ bool wxNotebook::DeletePage( int page ) bool wxNotebook::RemovePage( int page ) { - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) return FALSE; @@ -540,7 +540,7 @@ bool wxNotebook::RemovePage( int page ) return TRUE; } -bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, +bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString& text, bool select, int imageId ) { wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid notebook") ); @@ -554,7 +554,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, GtkNotebook *notebook = GTK_NOTEBOOK(m_widget); - wxNotebookPage *page = new wxNotebookPage(); + wxGtkNotebookPage *page = new wxGtkNotebookPage(); if (position < 0) m_pages.Append( page ); @@ -622,7 +622,7 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text, return TRUE; } -bool wxNotebook::AddPage(wxWindow* win, const wxString& text, +bool wxNotebook::AddPage(wxNotebookPage* win, const wxString& text, bool select, int imageId) { return InsertPage( -1, win, text, select, imageId ); @@ -636,13 +636,13 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.Skip(); } -wxWindow *wxNotebook::GetPage( int page ) const +wxNotebookPage *wxNotebook::GetPage( int page ) const { wxCHECK_MSG( m_widget != NULL, (wxWindow*) NULL, wxT("invalid notebook") ); - wxNotebookPage* nb_page = GetNotebookPage(page); + wxGtkNotebookPage* nb_page = GetNotebookPage(page); if (!nb_page) - return (wxWindow *) NULL; + return (wxNotebookPage *) NULL; else return nb_page->m_client; } -- 2.45.2