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

Fixes a few SGI compiler warnings..

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-12 20:26:54 +00:00
parent 14204c7acc
commit 0de9b5b23f
21 changed files with 91 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/choice.h
View File

@@ -69,6 +69,11 @@ public:
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n );
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
void *GetClientData() const { return wxControl::GetClientData(); }
void Clear(); void Clear();
void Delete(int n); void Delete(int n);

5
include/wx/gtk/combobox.h
View File

@@ -75,6 +75,11 @@ public:
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n );
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
void *GetClientData() const { return wxControl::GetClientData(); }
void Clear(); void Clear();
void Delete( int n ); void Delete( int n );

2
include/wx/gtk/dc.h
View File

@@ -88,7 +88,7 @@ public:
{ {
CrossHair(pt.x, pt.y); CrossHair(pt.x, pt.y);
} }
virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ); virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long yc );
inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre) inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
{ {
DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);

2
include/wx/gtk/dcclient.h
View File

@@ -45,7 +45,7 @@ public:
virtual void DrawLine( long x1, long y1, long x2, long y2 ); virtual void DrawLine( long x1, long y1, long x2, long y2 );
virtual void CrossHair( long x, long y ); virtual void CrossHair( long x, long y );
virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ); virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long yc );
virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ); virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
virtual void DrawPoint( long x, long y ); virtual void DrawPoint( long x, long y );

5
include/wx/gtk/listbox.h
View File

@@ -75,6 +75,11 @@ public:
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n );
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
void *GetClientData() const { return wxControl::GetClientData(); }
void Clear(); void Clear();
void Delete( int n ); void Delete( int n );

10
include/wx/gtk/mdi.h
View File

@@ -122,16 +122,14 @@ class wxMDIChildFrame: public wxFrame
// no status bars // no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1,
wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; } wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; } virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {} virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {} virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
// no size hints // no size hints
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW) ) int WXUNUSED(incW), int WXUNUSED(incH) ) {}
{
}
// no toolbar bars // no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),

3
include/wx/gtk/menu.h
View File

@@ -68,8 +68,9 @@ public:
void Enable( int id, bool enable ); void Enable( int id, bool enable );
bool IsEnabled( int id ) const; bool IsEnabled( int id ) const;
wxString GetLabel( int id ) const;
void SetLabel( int id, const wxString &label ); void SetLabel( int id, const wxString &label );
wxString GetLabel( int id ) const;
wxString GetLabel() const { return wxWindow::GetLabel(); }
void EnableTop( int pos, bool flag ); void EnableTop( int pos, bool flag );
void SetLabelTop( int pos, const wxString& label ); void SetLabelTop( int pos, const wxString& label );

27
include/wx/gtk/radiobox.h
View File

@@ -42,9 +42,8 @@ class wxRadioBox: public wxControl
DECLARE_DYNAMIC_CLASS(wxRadioBox) DECLARE_DYNAMIC_CLASS(wxRadioBox)
public: public:
wxRadioBox();
wxRadioBox(void);
inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title, inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = (const wxString *) NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
@@ -61,22 +60,32 @@ class wxRadioBox: public wxControl
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr ); const wxString& name = wxRadioBoxNameStr );
int FindString( const wxString& s) const; int FindString( const wxString& s) const;
void SetSelection( int n ); void SetSelection( int n );
int GetSelection(void) const; int GetSelection() const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
wxString GetLabel( int item ) const;
wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label ); void SetLabel( const wxString& label );
void SetLabel( int item, const wxString& label ); void SetLabel( int item, const wxString& label );
/* doesn't work */
void SetLabel( int item, wxBitmap *bitmap ); void SetLabel( int item, wxBitmap *bitmap );
wxString GetLabel( int item ) const;
bool Show( bool show ); bool Show( bool show );
void Show( int item, bool show );
bool Enable( bool enable ); bool Enable( bool enable );
void Enable( int item, bool enable ); void Enable( int item, bool enable );
void Show( int item, bool show );
virtual wxString GetStringSelection(void) const; virtual wxString GetStringSelection() const;
virtual bool SetStringSelection( const wxString& s ); virtual bool SetStringSelection( const wxString& s );
virtual int Number(void) const;
int GetNumberOfRowsOrCols(void) const; virtual int Number() const;
int GetNumberOfRowsOrCols() const;
void SetNumberOfRowsOrCols( int n ); void SetNumberOfRowsOrCols( int n );
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );

5
include/wx/gtk1/choice.h
View File

@@ -69,6 +69,11 @@ public:
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n );
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
void *GetClientData() const { return wxControl::GetClientData(); }
void Clear(); void Clear();
void Delete(int n); void Delete(int n);

5
include/wx/gtk1/combobox.h
View File

@@ -75,6 +75,11 @@ public:
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n );
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
void *GetClientData() const { return wxControl::GetClientData(); }
void Clear(); void Clear();
void Delete( int n ); void Delete( int n );

2
include/wx/gtk1/dc.h
View File

@@ -88,7 +88,7 @@ public:
{ {
CrossHair(pt.x, pt.y); CrossHair(pt.x, pt.y);
} }
virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ); virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long yc );
inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre) inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
{ {
DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);

2
include/wx/gtk1/dcclient.h
View File

@@ -45,7 +45,7 @@ public:
virtual void DrawLine( long x1, long y1, long x2, long y2 ); virtual void DrawLine( long x1, long y1, long x2, long y2 );
virtual void CrossHair( long x, long y ); virtual void CrossHair( long x, long y );
virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ); virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long yc );
virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ); virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
virtual void DrawPoint( long x, long y ); virtual void DrawPoint( long x, long y );

5
include/wx/gtk1/listbox.h
View File

@@ -75,6 +75,11 @@ public:
void SetClientObject( int n, wxClientData* clientData ); void SetClientObject( int n, wxClientData* clientData );
wxClientData* GetClientObject( int n ); wxClientData* GetClientObject( int n );
void SetClientObject( wxClientData *data ) { wxControl::SetClientObject( data ); }
wxClientData *GetClientObject() const { return wxControl::GetClientObject(); }
void SetClientData( void *data ) { wxControl::SetClientData( data ); }
void *GetClientData() const { return wxControl::GetClientData(); }
void Clear(); void Clear();
void Delete( int n ); void Delete( int n );

10
include/wx/gtk1/mdi.h
View File

@@ -122,16 +122,14 @@ class wxMDIChildFrame: public wxFrame
// no status bars // no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1,
wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; } wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
virtual wxStatusBar *GetStatusBar() { return (wxStatusBar*)NULL; } virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {} virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {} virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
// no size hints // no size hints
virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW) ) int WXUNUSED(incW), int WXUNUSED(incH) ) {}
{
}
// no toolbar bars // no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),

3
include/wx/gtk1/menu.h
View File

@@ -68,8 +68,9 @@ public:
void Enable( int id, bool enable ); void Enable( int id, bool enable );
bool IsEnabled( int id ) const; bool IsEnabled( int id ) const;
wxString GetLabel( int id ) const;
void SetLabel( int id, const wxString &label ); void SetLabel( int id, const wxString &label );
wxString GetLabel( int id ) const;
wxString GetLabel() const { return wxWindow::GetLabel(); }
void EnableTop( int pos, bool flag ); void EnableTop( int pos, bool flag );
void SetLabelTop( int pos, const wxString& label ); void SetLabelTop( int pos, const wxString& label );

27
include/wx/gtk1/radiobox.h
View File

@@ -42,9 +42,8 @@ class wxRadioBox: public wxControl
DECLARE_DYNAMIC_CLASS(wxRadioBox) DECLARE_DYNAMIC_CLASS(wxRadioBox)
public: public:
wxRadioBox();
wxRadioBox(void);
inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title, inline wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = (const wxString *) NULL, int n = 0, const wxString choices[] = (const wxString *) NULL,
@@ -61,22 +60,32 @@ class wxRadioBox: public wxControl
int majorDim = 0, long style = wxRA_HORIZONTAL, int majorDim = 0, long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator, const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr ); const wxString& name = wxRadioBoxNameStr );
int FindString( const wxString& s) const; int FindString( const wxString& s) const;
void SetSelection( int n ); void SetSelection( int n );
int GetSelection(void) const; int GetSelection() const;
wxString GetString( int n ) const; wxString GetString( int n ) const;
wxString GetLabel( int item ) const;
wxString GetLabel() const { return wxControl::GetLabel(); }
void SetLabel( const wxString& label ); void SetLabel( const wxString& label );
void SetLabel( int item, const wxString& label ); void SetLabel( int item, const wxString& label );
/* doesn't work */
void SetLabel( int item, wxBitmap *bitmap ); void SetLabel( int item, wxBitmap *bitmap );
wxString GetLabel( int item ) const;
bool Show( bool show ); bool Show( bool show );
void Show( int item, bool show );
bool Enable( bool enable ); bool Enable( bool enable );
void Enable( int item, bool enable ); void Enable( int item, bool enable );
void Show( int item, bool show );
virtual wxString GetStringSelection(void) const; virtual wxString GetStringSelection() const;
virtual bool SetStringSelection( const wxString& s ); virtual bool SetStringSelection( const wxString& s );
virtual int Number(void) const;
int GetNumberOfRowsOrCols(void) const; virtual int Number() const;
int GetNumberOfRowsOrCols() const;
void SetNumberOfRowsOrCols( int n ); void SetNumberOfRowsOrCols( int n );
void OnSize( wxSizeEvent &event ); void OnSize( wxSizeEvent &event );

2
include/wx/window.h
View File

@@ -156,7 +156,7 @@ public:
// label is just the same as the title (but for, e.g., buttons it // label is just the same as the title (but for, e.g., buttons it
// makes more sense to speak about labels) // makes more sense to speak about labels)
wxString GetLabel() const { return GetTitle(); } virtual wxString GetLabel() const { return GetTitle(); }
// the window name is used for ressource setting in X, it is not the // the window name is used for ressource setting in X, it is not the
// same as the window title/label // same as the window title/label

2
src/gtk/dc.cpp
View File

@@ -93,7 +93,7 @@ bool wxDC::Ok() const
} }
void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2), void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2),
double WXUNUSED(xc), double WXUNUSED(yc) ) long WXUNUSED(xc), long WXUNUSED(yc) )
{ {
} }

6
src/gtk/dcclient.cpp
View File

@@ -193,7 +193,7 @@ void wxWindowDC::CrossHair( long x, long y )
} }
} }
void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ) void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc )
{ {
wxCHECK_RET( Ok(), _T("invalid window dc") ); wxCHECK_RET( Ok(), _T("invalid window dc") );
@@ -201,8 +201,8 @@ void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double
long yy1 = YLOG2DEV(y1); long yy1 = YLOG2DEV(y1);
long xx2 = XLOG2DEV(x2); long xx2 = XLOG2DEV(x2);
long yy2 = YLOG2DEV(y2); long yy2 = YLOG2DEV(y2);
long xxc = XLOG2DEV((long)xc); long xxc = XLOG2DEV(xc);
long yyc = YLOG2DEV((long)yc); long yyc = YLOG2DEV(yc);
double dx = xx1 - xxc; double dx = xx1 - xxc;
double dy = yy1 - yyc; double dy = yy1 - yyc;
double radius = sqrt(dx*dx+dy*dy); double radius = sqrt(dx*dx+dy*dy);

2
src/gtk1/dc.cpp
View File

@@ -93,7 +93,7 @@ bool wxDC::Ok() const
} }
void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2), void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2),
double WXUNUSED(xc), double WXUNUSED(yc) ) long WXUNUSED(xc), long WXUNUSED(yc) )
{ {
} }

6
src/gtk1/dcclient.cpp
View File

@@ -193,7 +193,7 @@ void wxWindowDC::CrossHair( long x, long y )
} }
} }
void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ) void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc )
{ {
wxCHECK_RET( Ok(), _T("invalid window dc") ); wxCHECK_RET( Ok(), _T("invalid window dc") );
@@ -201,8 +201,8 @@ void wxWindowDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double
long yy1 = YLOG2DEV(y1); long yy1 = YLOG2DEV(y1);
long xx2 = XLOG2DEV(x2); long xx2 = XLOG2DEV(x2);
long yy2 = YLOG2DEV(y2); long yy2 = YLOG2DEV(y2);
long xxc = XLOG2DEV((long)xc); long xxc = XLOG2DEV(xc);
long yyc = YLOG2DEV((long)yc); long yyc = YLOG2DEV(yc);
double dx = xx1 - xxc; double dx = xx1 - xxc;
double dy = yy1 - yyc; double dy = yy1 - yyc;
double radius = sqrt(dx*dx+dy*dy); double radius = sqrt(dx*dx+dy*dy);