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

Attempts to reduce errors in compile farm for

Browse Source 
unusual combinations of platform/app


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-24 10:01:47 +00:00
parent b96a8bdb60
commit 3f2b72b240
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/msw/tmake/filelist.txt
View File

@@ -1199,7 +1199,6 @@ timer.h MotifH
toolbar.h MotifH
window.h MotifH
accel.h X11H
app.h X11H
bitmap.h X11H
brush.h X11H
@@ -1220,7 +1219,6 @@ gdiobj.h X11H
glcanvas.h X11H
icon.h X11H
joystick.h X11H
mdi.h X11H
minifram.h X11H
palette.h X11H
pen.h X11H
@@ -1228,9 +1226,7 @@ print.h X11H
private.h X11H
region.h X11H
reparent.h X11H
settings.h X11H
textctrl.h X11H
toolbar.h X11H
toplevel.h X11H
window.h X11H

8
samples/mobile/wxedit/wxedit.cpp
View File

@@ -325,7 +325,15 @@ void MyFrame::OnUpdateUI( wxUpdateUIEvent &event )
event.Enable( FALSE );
break;
case ID_DELETE:
#ifdef __WXUNIVERSAL__
event.Enable( m_text->HasSelection() );
#else
{
long selFrom, selTo;
m_text->GetSelection(& selFrom, & selTo);
event.Enable( selFrom != selTo );
}
#endif
break;
default:
break;

12
utils/dialoged/src/reseditr.cpp
View File

@@ -58,7 +58,7 @@
wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#if !defined(__WXMSW__)
#include "bitmaps/load.xpm"
#include "bitmaps/save.xpm"
#include "bitmaps/new.xpm"
@@ -150,11 +150,9 @@ bool wxResourceManager::Initialize()
windowsDir += "\\dialoged.ini" ;
m_optionsResourceFilename = windowsDir;
#elif defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMAC__) && defined(__DARWIN__))
#else
wxGetHomeDir( &m_optionsResourceFilename );
m_optionsResourceFilename += "/.dialogedrc";
#else
#error "Unsupported platform."
#endif
LoadOptions();
@@ -174,8 +172,7 @@ bool wxResourceManager::Initialize()
{
#ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#else
m_bitmapImage = new wxBitmap( wxwin_xpm );
#endif
}
@@ -768,8 +765,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
wxBitmap ToolbarCopyHeightBitmap("COPYHEIGHTTOOL");
wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");
#endif
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#else
wxBitmap ToolbarLoadBitmap( load_xpm );
wxBitmap ToolbarSaveBitmap( save_xpm);
wxBitmap ToolbarNewBitmap( new_xpm );

13
utils/dialoged/src/winprop.cpp
View File

@@ -1449,7 +1449,12 @@ wxProperty *wxRadioBoxPropertyInfo::GetProperty(wxString& name)
wxRadioBox *radioBox = (wxRadioBox *)m_propertyWindow;
if (name == "numberRowsOrCols")
{
// FIXME: Set/GetNumberOfRowsOrCols only implemented on Motif, MSW and Mac
#if defined(__WXMSW__) || defined(__WXMOTIF__) || defined(__WXMAC__)
return new wxProperty("numberRowsOrCols", (long)radioBox->GetNumberOfRowsOrCols(), "integer");
#else
return new wxProperty("numberRowsOrCols", (long)1, "integer");
#endif
}
if (name == "orientation")
{
@@ -1480,10 +1485,13 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxRadioBox *radioBox = (wxRadioBox *)m_propertyWindow;
if (name == "numberRowsOrCols")
{
// FIXME: Set/GetNumberOfRowsOrCols only implemented on Motif, MSW and Mac
#if defined(__WXMSW__) || defined(__WXMOTIF__) || defined(__WXMAC__)
wxResourceManager::GetCurrentResourceManager()->DeselectItemIfNecessary(radioBox);
radioBox->SetNumberOfRowsOrCols((int)property->GetValue().IntegerValue());
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
#endif
return TRUE;
}
else if (name == "orientation")
@@ -1587,7 +1595,12 @@ bool wxRadioBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
resource->SetStringValues(slist);
}
*/
// FIXME: Set/GetNumberOfRowsOrCols only implemented on Motif, MSW and Mac
#if defined(__WXMSW__) || defined(__WXMOTIF__) || defined(__WXMAC__)
resource->SetValue1(rbox->GetNumberOfRowsOrCols());
#else
resource->SetValue1(1);
#endif
return wxItemPropertyInfo::InstantiateResource(resource);
}