From 794005c0acc80bf21ca0ed2e1f42f1d78947957b Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 25 May 1999 09:01:22 +0000 Subject: [PATCH] Misc small changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/zipdist.bat | 4 ++++ docs/latex/wx/wx.hpj | Bin 239 -> 304 bytes include/wx/defs.h | 6 ++++++ include/wx/msw/gaugemsw.h | Bin 2253 -> 2495 bytes src/common/resource.cpp | 6 ++++++ src/msw/makefile.wat | 2 -- utils/dialoged/src/winprop.cpp | 20 ++++++++++++-------- 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index 1f6654a780..ae92d29bac 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -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 diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj index 7d53311fdd291152f5e7cd4c423a6dae9b38c957..0ebcb4e4688416dcfbf2207a88a1e359ec8dae9d 100644 GIT binary patch delta 107 zcmaFQxPfWHnG^;Da4O0#FHUtTEh)**E7s8DLdY;6v!i_-17f)pit|g0l2a8ji&5m9 NJVSue!Li7KTmVgm5nKQO delta 42 tcmdnM^qz6T8D*!U{PN;dr_z#={JdffO)jozU&nx0Am!v40%QdPnE*?g4Q>Dc diff --git a/include/wx/defs.h b/include/wx/defs.h index 22eeaba4a6..71c80d3284 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -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 diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h index 627f842afe907f53011996b0ef80710fc3d72edd..93180386ff2ead39faf8b81a4fe97747180aeaeb 100644 GIT binary patch literal 2495 zcmb_eTW{Jh6z=QtE3CFcFtNh+GOcJ2;ZmB3n+S}xFOf-1u$I`!aT;jV|GwiSG)WaG z+iFF`$LHd6{X(Phj!SDa&_sNBorGSq}*uRS4?DkI0zJ159OMR zRP{&bQOuC(V<8oD$Q`<(#6ip5wW2$MU`d=ry7{@${L=XLRWYU=^OMm{ty~(;Wh~7% zJ3-yGROeN@hF+T=P@6D2_UuEnT~OxmC_r9v3KrgRY1#!{F^8;>)z|0!-q2iFx0ZI6 zTNl8kj2srodsNii2<-Y8Q6`C4VVj`ytOVypQNkdlg`)y-L7DA^4p@k`4VyD5xOcTK z+RzFb1p-RZ7d+gcCEp%&_o<+g%RshOjnwUR2KuyTb?-*{(CAn|nPxR@Ajn_sZ8Lcn zN{jin3FS$4XZ3+or-q)8Zwbs?GQ?Z-9W`4(#~GjSAfcZ%lG|s29oW6PW#5eG;|2@D zWF1^c+SBMF>eMxO4p_>LmCgNvN(K^)OgQvN1;IRmo6)vQRygz|cuFPZtgfXm@{i_! zVvjmla#2AK`)&TB7k*t!ug;wiQ;HL6ngy8O?E_5^qPkBTr7e&x=C z*NcmF!~ni(E$uJGOIzyALrvjgbg;B%G58&=5~;+2N14xa zpdrG90|f(K%v5IkM4D?12)&?=T&IJW^mSq(70ND7X0=2lx&0tJaiPeL-B@z&DerH% zATGchb2{APp{VZ1D5_U>?n-AKzAI?) zYhjG6&UiS{XGYr?7_+-l*=%C+DQ|~Ta&{yXz`OFOAxiYD9pfFHhEsf`LWbB&8mGg3 zA2SEO0qL&y0N_}G@aLns+3Qw`qHBQ9�xnBD2`bb{oMZvDJSIP2pgfNOq=@r@Ad( k8S=McRVX|>FnA!K;O54|Zi2R^ao@A_`D~ns{71(B0C#RqX8-^I literal 2253 zcmeHITTk0C6n#iVJlGvb6zjRK&cD{d8hG{qW?0YuKkslvv zG~ez7P1aKFH=`DM8Gb+`!XjPSr=na?7V{!Qso8}HANV-VAziVUtWel@=l$L=ScF%h za|k<>k@}{BYGl|S&HEvswgM*`j3|>ttZ+oo!M?=@&LLsYCY6CjX&!^MC_52nQt% zJ)lh}FiXe~m*@vNJ%_bE_=IO>{ph^(tawDnTPz5ZZK%pH>wAdCZH>2csv3%Pg8H`U zOHocZ02&CU7qS(lM^-pbB_yYka`w7UK<`NdW$=FPqju}~l(Ph7a+exh-wm(EQ~!26 znz@5Iva046PHBuK7Y%e*eLm0eWPjZqNTn=kAO-|$H+>N;-7Vb~!@?12l4w_{H6fL#Ks$4E`^!p!NbQ(}R1uw9OA<|}x zC0){#%AHbV5Wj^#3cKUs#GUyU{=lEz)QGvrrR40L!a&bnKLgZ^9-m}flTC%pacW5K z^34Xb7=+V)_3l8}8c@)DG!J@Slc;qI^zsn_Z(G47iPUfMi9$VZdoA75W(}37R-^Vj zyT{egfqv=5$du( MIh6!xs{KU&02YRs4FCWD diff --git a/src/common/resource.cpp b/src/common/resource.cpp index f5168e6796..8c9d706d43 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -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 }, diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat index b1101861b0..e2ffa86053 100644 --- a/src/msw/makefile.wat +++ b/src/msw/makefile.wat @@ -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 diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp index 75bf9efc32..afebc0f554 100644 --- a/utils/dialoged/src/winprop.cpp +++ b/utils/dialoged/src/winprop.cpp @@ -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; } -- 2.50.0