github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Controls4U: Updates in namespace

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10584 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2016-12-25 16:14:01 +00:00
parent 28cbd2c033
commit 3bf7deba1b
14 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bazaar/Controls4U/ActiveX.cpp
View file

@ -3,7 +3,8 @@
#include <CtrlLib/CtrlLib.h>
#include "ActiveX.h"
NAMESPACE_UPP
using namespace Upp;
//NAMESPACE_UPP
bool BSTRSet(const String str, BSTR &bstr) {
wchar_t *buffer;
@ -373,6 +374,6 @@ HRESULT STDMETHODCALLTYPE AXClientSite::OnPosRectChange(LPCRECT lprcPosRect) {
return S_OK;
}
END_UPP_NAMESPACE
//END_UPP_NAMESPACE
#endif

4
bazaar/Controls4U/ActiveX.h
View file

@ -16,7 +16,7 @@
#include <Exdisp.h>
#include "plugin/vlc/axvlc_idl.h"
NAMESPACE_UPP
//NAMESPACE_UPP
static const CLSID CLSID_MozillaBrowser = {0x1339B54C, 0x3453, 0x11D2, {0x93, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; //http://www.iol.ie/~locka/mozilla/control.htm
@ -137,6 +137,6 @@ private:
};
};
END_UPP_NAMESPACE
//END_UPP_NAMESPACE
#endif

5
bazaar/Controls4U/ActiveX_base.h
View file

@ -1,7 +1,8 @@
#ifndef _hdIE_ActiveX_Support_h_
#define _hdIE_ActiveX_Support_h_
NAMESPACE_UPP
using namespace Upp;
//NAMESPACE_UPP
bool BSTRSet(const String str, BSTR &bstr);
String BSTRGet(BSTR &bstr);
@ -119,6 +120,6 @@ private:
bool status;
};
END_UPP_NAMESPACE
//END_UPP_NAMESPACE
#endif

6
bazaar/Controls4U/Controls4U.cpp
View file

@ -1,6 +1,7 @@
#include <CtrlLib/CtrlLib.h>
#include "Controls4U.h"
#include "Controls4U/Controls4U.h"
using namespace Upp;
#define TFILE <Controls4U/Controls4U.t>
#include <Core/t.h>
@ -12,7 +13,7 @@
#define TOPICFILE <Controls4U/src.tpp/all.i>
#include <Core/topic_group.h>
NAMESPACE_UPP
void PaintCenterText(Painter &w, double x, double y, String text, Font fnt, Color color) {
Size sz = GetTextSize(text, fnt);
@ -2134,4 +2135,3 @@ AboutUpp::AboutUpp() {
Add(about.SizePos());
}
END_UPP_NAMESPACE

5
bazaar/Controls4U/Controls4U.h
View file

@ -12,7 +12,8 @@
#include "Controls4U/StarIndicator.h"
#include "Controls4U/SplitterButton.h"
NAMESPACE_UPP
//NAMESPACE_UPP
using namespace Upp;
double AngAdd(double ang, double val);
@ -750,6 +751,6 @@ private:
};
END_UPP_NAMESPACE
//END_UPP_NAMESPACE
#endif

5
bazaar/Controls4U/IExplorerBrowser.cpp
View file

@ -3,7 +3,8 @@
#include <CtrlLib/CtrlLib.h>
#include "ActiveX.h"
NAMESPACE_UPP
using namespace Upp;
//NAMESPACE_UPP
bool InternetExplorerBrowser::Browse(const String &strurl) {
IIWebBrowser webBrowser(this);
@ -182,6 +183,6 @@ bool InternetExplorerBrowser::SetSilent(bool val) {
return false;
}
END_UPP_NAMESPACE
//END_UPP_NAMESPACE
#endif

4
bazaar/Controls4U/PainterCanvas.cpp
View file

@ -1,4 +1,8 @@
#include <CtrlLib/CtrlLib.h>
#include "Controls4U.h"
using namespace Upp;
#include <plugin/jpg/jpg.h>
#define TFILE <Controls4U/Controls4U.t>

1
bazaar/Controls4U/PainterCanvas.h
View file

@ -1,6 +1,7 @@
#ifndef _Controls4U_PainterCanvas_h_
#define _Controls4U_PainterCanvas_h_
class Svg2DTransform {
public:
Svg2DTransform() {Init();}

7
bazaar/Controls4U/SliderCtrlX.cpp
View file

@ -13,9 +13,12 @@
**********************************************************************************************/
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
#include "SliderCtrlX.h"
NAMESPACE_UPP
//NAMESPACE_UPP
#define IMAGECLASS SliderThumbsImg
#define IMAGEFILE <Controls4U/SliderCtrlX.iml>
@ -573,4 +576,4 @@ int SliderCtrlX::SliderToClient(int v) const
return v;
}
END_UPP_NAMESPACE
//END_UPP_NAMESPACE

4
bazaar/Controls4U/SliderCtrlX.h
View file

@ -1,4 +1,4 @@
NAMESPACE_UPP
//NAMESPACE_UPP
class SliderCtrlX : public Ctrl {
static const int BORDER_SIZE = 2;
@ -111,4 +111,4 @@ public:
SliderCtrlX& UseCustomThumbs( bool b = true ) { m_bUseCustomThumbs = b; return *this; };
};
END_UPP_NAMESPACE
//END_UPP_NAMESPACE

7
bazaar/Controls4U/SplitterButton.cpp
View file

@ -1,7 +1,10 @@
#include <CtrlLib/CtrlLib.h>
using namespace Upp;
#include "SplitterButton.h"
NAMESPACE_UPP
//NAMESPACE_UPP
SplitterButton::SplitterButton() {
Add(splitter.SizePos());
@ -168,4 +171,4 @@ void SplitterButton::SetArrows() {
}
}
END_UPP_NAMESPACE
//END_UPP_NAMESPACE

4
bazaar/Controls4U/SplitterButton.h
View file

@ -1,7 +1,7 @@
#ifndef _Controls4U_SplitterButton_h_
#define _Controls4U_SplitterButton_h_
NAMESPACE_UPP
//NAMESPACE_UPP
class SplitterButton : public StaticRect {
public:
@ -49,6 +49,6 @@ private:
void SetArrows();
};
END_UPP_NAMESPACE
//END_UPP_NAMESPACE
#endif

5
bazaar/Controls4U/StarIndicator.cpp
View file

@ -21,7 +21,8 @@
#include <CtrlLib/CtrlLib.h>
#include "StarIndicator.h"
NAMESPACE_UPP
using namespace Upp;
//NAMESPACE_UPP
#define IMAGECLASS StarsImg
#define IMAGEFILE <Controls4U/StarIndicator.iml>
@ -180,4 +181,4 @@ StarIndicator& StarIndicator::SetVotes(int n)
return *this;
}
END_UPP_NAMESPACE
//END_UPP_NAMESPACE

5
bazaar/Controls4U/StarIndicator.h
View file

@ -1,6 +1,7 @@
#include <CtrlLib/CtrlLib.h>
NAMESPACE_UPP
using namespace Upp;
//NAMESPACE_UPP
class StarIndicator : public ProgressIndicator {
private:
@ -35,4 +36,4 @@ public:
virtual StarIndicator& ShowVotes(bool b) { m_bVotes=b; return *this; }
};
END_UPP_NAMESPACE
//END_UPP_NAMESPACE