AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Misc small changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-05-25 09:01:22 +00:00
parent cfb50f14ec
commit 794005c0ac
7 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/msw/zipdist.bat
View File

@ -14,6 +14,7 @@ erase %dest\wx200*.zip
erase %dest\glcanvas.zip
erase %dest\ogl3.zip
erase %dest\tex2rtf2.zip
erase %dest\jpeg.zip
cd %src
echo Zipping...
@ -52,6 +53,9 @@ zip32 -@ %dest\tex2rtf2.zip < %src\distrib\msw\tex2rtf.rsp
rem wxTreeLayout
zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.rsp
rem JPEG source
zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
copy %src\docs\changes.txt %dest
copy %src\docs\msw\install.txt %dest\install_msw.txt
copy %src\docs\motif\install.txt %dest\install_motif.txt

BIN
docs/latex/wx/wx.hpj
View File

Binary file not shown.

6
include/wx/defs.h
View File

@ -181,6 +181,12 @@
// in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed)
// but not implemented, so we must #define it
#define bool unsigned int
#elif defined(__VISUALC__) && (__VISUALC__ == 1010)
// For VisualC++ 4.1, we need to define
// bool as something between 4.0 & 5.0...
typedef unsigned int wxbool;
#define bool wxbool
#define HAVE_BOOL
#elif defined(__VISUALC__) && (__VISUALC__ > 1020)
// VC++ supports bool since 4.2
#define HAVE_BOOL

BIN
include/wx/msw/gaugemsw.h
View File

Binary file not shown.

6
src/common/resource.cpp
View File

@ -651,6 +651,9 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
}
dialogItem->SetStyle(windowStyle);
dialogItem->SetValue1(isModal);
if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
dialogItem->SetValue1(TRUE);
dialogItem->SetName(name);
dialogItem->SetTitle(title);
dialogItem->SetSize(x, y, width, height);
@ -1893,6 +1896,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
{ _T("wxTB_VERTICAL"), wxTB_VERTICAL},
{ _T("wxTB_FLAT"), wxTB_FLAT},
/* wxDialog */
{ _T("wxDIALOG_MODAL"), wxDIALOG_MODAL },
/* Generic */
{ _T("wxVSCROLL"), wxVSCROLL },
{ _T("wxHSCROLL"), wxHSCROLL },

2
src/msw/makefile.wat
View File

@ -459,7 +459,6 @@ tabctrl.obj: $(MSWDIR)\tabctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
taskbar.obj: $(MSWDIR)\taskbar.cpp
cl @<<
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
tbar95.obj: $(MSWDIR)\tbar95.cpp
@ -481,7 +480,6 @@ tooltip.obj: $(MSWDIR)\tooltip.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
treectrl.obj: $(MSWDIR)\treectrl.cpp
cl @<<
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
utils.obj: $(MSWDIR)\utils.cpp

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

@ -1043,7 +1043,7 @@ bool wxTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(text);
resource->SetStyle(flag);
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(text, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(text, this);
return TRUE;
}
else if (name == "readonly")
@ -1062,7 +1062,7 @@ bool wxTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(text);
resource->SetStyle(flag);
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(text, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(text, this);
return TRUE;
}
else
@ -1158,7 +1158,7 @@ bool wxListBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(listBox);
if (resource)
resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(listBox, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(listBox, this);
return TRUE;
}
else
@ -1322,7 +1322,7 @@ bool wxComboBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(m_propertyWindow, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(m_propertyWindow, this);
return TRUE;
}
else if (name == "style")
@ -1343,7 +1343,7 @@ bool wxComboBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(m_propertyWindow);
resource->SetStyle(m_propertyWindow->GetWindowStyleFlag());
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(m_propertyWindow, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(m_propertyWindow, this);
return TRUE;
}
@ -1418,7 +1418,7 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
if (name == "numberRowsOrCols")
{
radioBox->SetNumberOfRowsOrCols((int)property->GetValue().IntegerValue());
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
return TRUE;
}
else if (name == "orientation")
@ -1441,7 +1441,7 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(radioBox);
resource->SetStyle(windowStyle);
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
return TRUE;
}
else if (name == "values")
@ -1463,7 +1463,7 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
expr = expr->GetNext();
}
resource->SetStringValues(stringList);
wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
return TRUE;
}
return wxItemPropertyInfo::SetProperty(name, property);
@ -1669,6 +1669,7 @@ bool wxSliderPropertyInfo::SetProperty(wxString& name, wxProperty *property)
slider = (wxSlider *)wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(slider, this);
slider->SetSize(-1, -1, h, w);
m_propertyWindow = slider;
return TRUE;
}
@ -1834,6 +1835,7 @@ bool wxScrollBarPropertyInfo::SetProperty(wxString& name, wxProperty *property)
} /* IF */
scrollBar = (wxScrollBar *)wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(scrollBar, this);
m_propertyWindow = scrollBar;
return TRUE;
}
@ -2031,6 +2033,7 @@ bool wxPanelPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxColour col(r,g,b);
panelWindow->SetBackgroundColour(col);
panelWindow = (wxPanel *)wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(panelWindow, this);
m_propertyWindow = panelWindow;
return TRUE;
}
else if (name == "title")
@ -2110,6 +2113,7 @@ bool wxPanelPropertyInfo::SetProperty(wxString& name, wxProperty *property)
}
resource->SetResourceStyle(style);
panelWindow = (wxPanel *)wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(panelWindow, this);
m_propertyWindow = panelWindow;
// TODO: need to regenerate the width and height properties else they'll be inconsistent.
return TRUE;
}