Fix some type conversion warnings.

This commit is contained in:
Unknown W. Brackets committed 2014-08-30 02:05:21 -07:00
1 parent 2d4e491d56
commit ca16eb2857
3 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -515,7 +515,7 @@ static int VertexDataTypeToD3DType(T3DVertexDataType type) {
Thin3DDX9VertexFormat::Thin3DDX9VertexFormat(LPDIRECT3DDEVICE9 device, const std::vector<Thin3DVertexComponent> &components, int stride) : decl_(NULL) {
D3DVERTEXELEMENT9 *elements = new D3DVERTEXELEMENT9[components.size() + 1];
int i;
size_t i;
for (i = 0; i < components.size(); i++) {
elements[i].Stream = 0;
elements[i].Offset = components[i].offset;
+1 -1
View File
@@ -728,7 +728,7 @@ void TextEdit::Key(const KeyInput &input) {
size_t maxPaste = maxLen_ - text_.size();
if (clipText.size() > maxPaste) {
int end = 0;
while (end < maxPaste) {
while ((size_t)end < maxPaste) {
u8_inc(clipText.c_str(), &end);
}
if (end > 0) {
+2 -2
View File
@@ -673,7 +673,7 @@ public:
TextEdit(const std::string &text, const std::string &placeholderText, LayoutParams *layoutParams = 0);
void SetText(const std::string &text) { text_ = text; caret_ = (int)text_.size(); }
const std::string &GetText() const { return text_; }
void SetMaxLen(int maxLen) { maxLen_ = maxLen; }
void SetMaxLen(size_t maxLen) { maxLen_ = maxLen; }
virtual void GetContentDimensions(const UIContext &dc, float &w, float &h) const override;
virtual void Draw(UIContext &dc) override;
@@ -687,7 +687,7 @@ private:
std::string undo_;
std::string placeholderText_;
int caret_;
int maxLen_;
size_t maxLen_;
bool ctrlDown_; // TODO: Make some global mechanism for this.
// TODO: Selections
};