diff options
| author | Narendra Umate <[email protected]> | 2013-09-07 15:43:32 -0700 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-09-07 15:43:32 -0700 |
| commit | c3ca7291626b60a32008774dd290671708babc20 (patch) | |
| tree | c87d1097bb8b59b6724ca19560f7c92b0309caf3 /mp/src/vgui2 | |
| parent | Update .gitignore. (diff) | |
| parent | Added missing libs for linux and OSX in their new location. (diff) | |
| download | source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.tar.xz source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mp/src/vgui2')
| -rw-r--r-- | mp/src/vgui2/vgui_controls/TextEntry.cpp | 2 | ||||
| -rw-r--r-- | mp/src/vgui2/vgui_controls/vgui_controls.vpc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mp/src/vgui2/vgui_controls/TextEntry.cpp b/mp/src/vgui2/vgui_controls/TextEntry.cpp index 3b0c189f..cecf3e04 100644 --- a/mp/src/vgui2/vgui_controls/TextEntry.cpp +++ b/mp/src/vgui2/vgui_controls/TextEntry.cpp @@ -3355,7 +3355,7 @@ void TextEntry::CopySelected() buf.AddToTail(m_TextStream[i]);
}
buf.AddToTail('\0');
- system()->SetClipboardText(buf.Base(), x1 - x0);
+ system()->SetClipboardText(buf.Base(), buf.Count());
}
// have to request focus if we used the menu
diff --git a/mp/src/vgui2/vgui_controls/vgui_controls.vpc b/mp/src/vgui2/vgui_controls/vgui_controls.vpc index f3b1d116..2b90d073 100644 --- a/mp/src/vgui2/vgui_controls/vgui_controls.vpc +++ b/mp/src/vgui2/vgui_controls/vgui_controls.vpc @@ -7,7 +7,6 @@ $macro SRCDIR "..\.."
$Macro GENERATED_PROTO_DIR "generated_proto"
$macro PROTOBUF_LITE 0
-$Macro OUTLIBDIR "$SRCDIR\lib\public" [!$LINUX]
$include "$SRCDIR\vpc_scripts\source_lib_base.vpc"
$include "$SRCDIR\vpc_scripts\protobuf_builder.vpc"
|