Added SetFont to most controls and controls sample
(recompile) Added tiny bit of documentation to window.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,6 +60,7 @@ class wxButton: public wxControl
|
||||
void SetDefault(void);
|
||||
void SetLabel( const wxString &label );
|
||||
void Enable( bool enable );
|
||||
void SetFont( const wxFont &font );
|
||||
};
|
||||
|
||||
#endif // __GTKBUTTONH__
|
||||
|
@@ -59,6 +59,7 @@ class wxCheckBox: public wxControl
|
||||
const wxString& name = wxCheckBoxNameStr );
|
||||
void SetValue( bool state );
|
||||
bool GetValue(void) const;
|
||||
void SetFont( const wxFont &font );
|
||||
};
|
||||
|
||||
#endif // __GTKCHECKBOXH__
|
||||
|
@@ -73,6 +73,7 @@ class wxChoice: public wxControl
|
||||
void SetColumns( int n = 1 );
|
||||
void SetSelection( int n );
|
||||
void SetStringSelection( const wxString &string );
|
||||
void SetFont( const wxFont &font );
|
||||
};
|
||||
|
||||
#endif // __GTKCHOICEH__
|
||||
|
@@ -64,7 +64,6 @@ class wxComboBox: public wxControl
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxComboBoxNameStr);
|
||||
|
||||
// List functions
|
||||
void Clear(void);
|
||||
void Append( const wxString &item );
|
||||
void Append( const wxString &item, char* clientData );
|
||||
@@ -79,11 +78,9 @@ class wxComboBox: public wxControl
|
||||
void SetSelection( int n );
|
||||
void SetStringSelection( const wxString &string );
|
||||
|
||||
// Text field functions
|
||||
wxString GetValue(void) const ;
|
||||
void SetValue(const wxString& value);
|
||||
|
||||
// Clipboard operations
|
||||
void Copy(void);
|
||||
void Cut(void);
|
||||
void Paste(void);
|
||||
@@ -95,14 +92,17 @@ class wxComboBox: public wxControl
|
||||
void Remove(long from, long to);
|
||||
void SetSelection(long from, long to);
|
||||
void SetEditable(bool editable);
|
||||
|
||||
void SetFont( const wxFont &font );
|
||||
|
||||
// implementation
|
||||
|
||||
bool m_alreadySent;
|
||||
|
||||
private:
|
||||
|
||||
wxList m_clientData;
|
||||
|
||||
public:
|
||||
|
||||
bool m_alreadySent;
|
||||
};
|
||||
|
||||
#endif // __GTKCOMBOBOXH__
|
||||
|
@@ -74,12 +74,8 @@ class wxFont: public wxGDIObject
|
||||
bool GetUnderlined(void) const;
|
||||
|
||||
wxFont( char *xFontName );
|
||||
|
||||
private:
|
||||
|
||||
friend wxDC;
|
||||
friend wxPaintDC;
|
||||
friend wxWindow;
|
||||
|
||||
// implementation
|
||||
|
||||
GdkFont* GetInternalFont(float scale = 1.0) const;
|
||||
|
||||
|
@@ -82,6 +82,7 @@ class wxListBox: public wxControl
|
||||
void SetSelection( int n, bool select = TRUE );
|
||||
void SetString( int n, const wxString &string );
|
||||
void SetStringSelection( const wxString &string, bool select = TRUE );
|
||||
void SetFont( const wxFont &font );
|
||||
|
||||
virtual GtkWidget *GetConnectWidget(void);
|
||||
|
||||
|
@@ -79,14 +79,16 @@ class wxRadioBox: public wxControl
|
||||
virtual int Number(void) const;
|
||||
int GetNumberOfRowsOrCols(void) const;
|
||||
void SetNumberOfRowsOrCols( int n );
|
||||
void SetFont( const wxFont &font );
|
||||
|
||||
// implementation
|
||||
|
||||
bool m_alreadySent;
|
||||
|
||||
private:
|
||||
|
||||
GtkRadioButton *m_radio;
|
||||
|
||||
public:
|
||||
|
||||
bool m_alreadySent;
|
||||
};
|
||||
|
||||
#endif // __GTKRADIOBOXH__
|
||||
|
@@ -61,6 +61,7 @@ class wxRadioButton: public wxControl
|
||||
virtual void SetLabel(const wxString& label);
|
||||
virtual void SetValue(bool val);
|
||||
virtual bool GetValue(void) const;
|
||||
void SetFont( const wxFont &font );
|
||||
};
|
||||
|
||||
#endif // __GTKRADIOBUTTONH__
|
||||
|
@@ -101,6 +101,10 @@ class wxTextCtrl: public wxControl, public streambuf
|
||||
wxTextCtrl& operator<<(double d);
|
||||
wxTextCtrl& operator<<(const char c);
|
||||
|
||||
void SetFont( const wxFont &font );
|
||||
|
||||
// implementation
|
||||
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
|
||||
|
@@ -271,6 +271,7 @@ public: // cannot get private going yet
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_hasScrolling;
|
||||
bool m_hasOwnStyle;
|
||||
bool m_hasVMT;
|
||||
bool m_sizeSet;
|
||||
bool m_resizing;
|
||||
|
Reference in New Issue
Block a user