just some warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -347,7 +347,6 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
|
|||||||
int w = noUnitsX * pixelsPerUnitX;
|
int w = noUnitsX * pixelsPerUnitX;
|
||||||
int h = noUnitsY * pixelsPerUnitY;
|
int h = noUnitsY * pixelsPerUnitY;
|
||||||
|
|
||||||
wxSize sz = m_targetWindow->GetClientSize();
|
|
||||||
m_targetWindow->SetVirtualSizeHints( w, h );
|
m_targetWindow->SetVirtualSizeHints( w, h );
|
||||||
|
|
||||||
// The above should arguably be deprecated, this however we still need.
|
// The above should arguably be deprecated, this however we still need.
|
||||||
|
@@ -243,7 +243,10 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
|
|
||||||
wxLogTrace(wxTRACE_Messages,
|
wxLogTrace(wxTRACE_Messages,
|
||||||
"Created frame (0x%08x) with work area 0x%08x and client "
|
"Created frame (0x%08x) with work area 0x%08x and client "
|
||||||
"area 0x%08x", m_frameWidget, m_workArea, m_clientArea);
|
"area 0x%08x",
|
||||||
|
(unsigned)m_frameWidget,
|
||||||
|
(unsigned)m_workArea,
|
||||||
|
(unsigned)m_clientArea);
|
||||||
|
|
||||||
XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE,
|
XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE,
|
||||||
wxUniversalRepaintProc, (XtPointer) this);
|
wxUniversalRepaintProc, (XtPointer) this);
|
||||||
|
@@ -69,10 +69,6 @@
|
|||||||
#pragma message enable nosimpint
|
#pragma message enable nosimpint
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// private functions
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
// Yuck this is really BOTH site and platform dependent
|
// Yuck this is really BOTH site and platform dependent
|
||||||
// so we should use some other strategy!
|
// so we should use some other strategy!
|
||||||
#ifdef sun
|
#ifdef sun
|
||||||
@@ -81,8 +77,6 @@
|
|||||||
#define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
|
#define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static char *GetIniFile (char *dest, const char *filename);
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -226,6 +220,8 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
|
|||||||
// Reading and writing resources (eg WIN.INI, .Xdefaults)
|
// Reading and writing resources (eg WIN.INI, .Xdefaults)
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_RESOURCES
|
||||||
|
|
||||||
// Read $HOME for what it says is home, if not
|
// Read $HOME for what it says is home, if not
|
||||||
// read $USER or $LOGNAME for user name else determine
|
// read $USER or $LOGNAME for user name else determine
|
||||||
// the Real User, then determine the Real home dir.
|
// the Real User, then determine the Real home dir.
|
||||||
@@ -256,8 +252,6 @@ static char * GetIniFile (char *dest, const char *filename)
|
|||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxUSE_RESOURCES
|
|
||||||
|
|
||||||
static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
|
static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
|
||||||
{
|
{
|
||||||
if (create && wxFileExists (name) ) {
|
if (create && wxFileExists (name) ) {
|
||||||
|
@@ -1820,7 +1820,7 @@ bool wxAddWindowToTable(Widget w, wxWindow *win)
|
|||||||
wxWidgetHashTable->Put((long) w, win);
|
wxWidgetHashTable->Put((long) w, win);
|
||||||
|
|
||||||
wxLogTrace("widget", "Widget 0x%08x <-> window %p (%s)",
|
wxLogTrace("widget", "Widget 0x%08x <-> window %p (%s)",
|
||||||
w, win, win->GetClassInfo()->GetClassName());
|
(unsigned)w, win, win->GetClassInfo()->GetClassName());
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@@ -3187,12 +3187,12 @@ static int FindSortedItemPos(XmComboBoxWidget w, XmString item)
|
|||||||
*/
|
*/
|
||||||
static Boolean CheckComboBox(Widget w, char *pFuncName)
|
static Boolean CheckComboBox(Widget w, char *pFuncName)
|
||||||
{
|
{
|
||||||
char buff[256];
|
|
||||||
char *pWName;
|
|
||||||
|
|
||||||
#if (XmVersion >= 2000)
|
#if (XmVersion >= 2000)
|
||||||
return False; /* temporary workaround */
|
return False; /* temporary workaround */
|
||||||
#else
|
#else
|
||||||
|
char buff[256];
|
||||||
|
char *pWName;
|
||||||
|
|
||||||
if ( XmIsComboBox(w) ) return False;
|
if ( XmIsComboBox(w) ) return False;
|
||||||
pWName = XrmQuarkToString(w->core.xrm_name);
|
pWName = XrmQuarkToString(w->core.xrm_name);
|
||||||
sprintf(buff,
|
sprintf(buff,
|
||||||
|
Reference in New Issue
Block a user