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

Motif and other mods

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-10-26 17:10:25 +00:00
parent f4a4bd13d4
commit 4b5f3fe655
60 changed files with 618 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/motif/button.h
View File

@@ -46,7 +46,7 @@ class WXDLLEXPORT wxButton: public wxControl
virtual void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
};

2
include/wx/motif/checkbox.h
View File

@@ -47,7 +47,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
virtual void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
};

2
include/wx/motif/choice.h
View File

@@ -68,7 +68,7 @@ class WXDLLEXPORT wxChoice: public wxControl
void SetFocus();
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const { return m_formWidget; }

2
include/wx/motif/combobox.h
View File

@@ -74,7 +74,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
virtual void SetEditable(bool editable);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
};

2
include/wx/motif/dialog.h
View File

@@ -94,7 +94,7 @@ public:
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
inline WXWidget GetTopWidget() const { return m_mainWidget; }

2
include/wx/motif/frame.h
View File

@@ -145,7 +145,7 @@ public:
virtual void ReleaseMouse();
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetMenuBarWidget() const ;

2
include/wx/motif/gauge.h
View File

@@ -61,7 +61,7 @@ class WXDLLEXPORT wxGauge: public wxControl
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();

2
include/wx/motif/listbox.h
View File

@@ -90,7 +90,7 @@ class WXDLLEXPORT wxListBox: public wxControl
void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const;

50
include/wx/motif/notebook.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: notebook.h
// Purpose: MSW/GTK compatible notebook (a.k.a. property sheet)
// Purpose: wxNotebook class (a.k.a. property sheet, tabbed dialog)
// Author: Julian Smart
// Modified by:
// RCS-ID: $Id$
@@ -21,6 +21,7 @@
#include "wx/dynarray.h"
#include "wx/event.h"
#include "wx/control.h"
#include "wx/generic/tabg.h"
// ----------------------------------------------------------------------------
// types
@@ -59,9 +60,38 @@ private:
// wxNotebook
// ----------------------------------------------------------------------------
// @@@ this class should really derive from wxTabCtrl, but the interface is not
// exactly the same, so I can't do it right now and instead we reimplement
// part of wxTabCtrl here
class WXDLLEXPORT wxNotebook;
// This reuses wxTabView to draw the tabs.
class WXDLLEXPORT wxNotebookTabView: public wxTabView
{
DECLARE_DYNAMIC_CLASS(wxNotebookTabView)
public:
wxNotebookTabView(wxNotebook* notebook, long style = wxTAB_STYLE_DRAW_BOX | wxTAB_STYLE_COLOUR_INTERIOR);
~wxNotebookTabView(void);
// Called when a tab is activated
virtual void OnTabActivate(int activateId, int deactivateId);
/*
// Specific to this class
void AddTabWindow(int id, wxWindow *window);
wxWindow *GetTabWindow(int id) const ;
void ClearWindows(bool deleteWindows = TRUE);
inline wxWindow *GetCurrentWindow() const { return m_currentWindow; }
void ShowWindowForTab(int id);
*/
protected:
/*
// List of panels, one for each tab. Indexed
// by tab ID.
wxList m_tabWindows;
wxWindow* m_currentWindow;
*/
wxNotebook* m_notebook;
};
class wxNotebook : public wxControl
{
public:
@@ -163,7 +193,15 @@ public:
virtual bool DoPhase(int nPhase);
// Implementation
virtual void ChangeFont();
// wxNotebook on Motif uses a generic wxTabView to implement itself.
inline wxTabView *GetTabView() const { return m_tabView; }
inline void SetTabView(wxTabView *v) { m_tabView = v; }
void OnMouseEvent(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
@@ -179,6 +217,8 @@ protected:
int m_nSelection; // the current selection (-1 if none)
wxTabView* m_tabView;
DECLARE_DYNAMIC_CLASS(wxNotebook)
DECLARE_EVENT_TABLE()
};

2
include/wx/motif/radiobox.h
View File

@@ -69,7 +69,7 @@ public:
inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const { return m_formWidget; }

2
include/wx/motif/radiobut.h
View File

@@ -49,7 +49,7 @@ public:
void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
};

2
include/wx/motif/scrolbar.h
View File

@@ -57,7 +57,7 @@ public:
void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();

2
include/wx/motif/slider.h
View File

@@ -78,7 +78,7 @@ public:
void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();

2
include/wx/motif/spinbutt.h
View File

@@ -65,7 +65,7 @@ class WXDLLEXPORT wxSpinButton: public wxControl
void Command(wxCommandEvent& event) { ProcessCommand(event); };
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();

2
include/wx/motif/statbmp.h
View File

@@ -57,7 +57,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
virtual bool AcceptsFocus() const { return FALSE; }
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();

2
include/wx/motif/statbox.h
View File

@@ -52,7 +52,7 @@ class WXDLLEXPORT wxStaticBox: public wxControl
wxString GetLabel() const;
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const { return m_formWidget; }

2
include/wx/motif/stattext.h
View File

@@ -48,7 +48,7 @@ class WXDLLEXPORT wxStaticText: public wxControl
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
};

2
include/wx/motif/textctrl.h
View File

@@ -127,7 +127,7 @@ public:
virtual void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont();
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
inline void SetModified(bool mod) { m_modified = mod; }

2
include/wx/motif/window.h
View File

@@ -488,7 +488,7 @@ public:
virtual WXRegion GetPaintRegion() const { return m_paintRegion; }
// Change properties
virtual void ChangeFont(); // Change to the current font (often overridden)
virtual void ChangeFont(bool keepOriginalSize = TRUE); // Change to the current font (often overridden)
virtual void DoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour);
virtual void DoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour = FALSE);
// These to be overridden as needed (may change several widgets)